Merge branch 'master-base' into master-prod-new

chenjiahe

2024-07-25 37993b3cf3243e6ffdacab526b04dd2284565a42

 phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java

@@ -25,6 +25,8 @@
    private String signTemplateName;
    /** 模板类型(电子病历和处方时选择的模板) */
    private String templateType;
    /** 签署任务编号 */
    private String signTaskId;

    /** 操作人类型(OperatorConstants) */
    private Integer opType;