Merge branch 'fhx-base-治疗单改版0729' into master-prod-new

fhx

2024-08-26 ce0dc32dcecbe1cf19d63c7bed1a87a90191f2ed

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

@@ -75,5 +75,8 @@
    /** 操作人角色id(EmployeeRole) */
    private String opRoleId;

    /**审批备注*/
    private String remark;


}