Merge branch 'master' into master-test

wangrenhuang

2023-11-13 499737916d0cb59092c04d6523d4607ff0a5556a

 phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java

@@ -12,7 +12,7 @@

    /******MarketingDto继承字段 -必填项****/

    /**审核类型 >1000的值 -必填项*/
    /**审核类型 >1000的值 (参考m_application_subject) -必填项*/
    private Integer type;
    /**审核类型唯一字符串  -必填项*/
    private String typeStr;