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

fwq

2024-07-08 6a3f8907a2f9d240f8a07e7283682286d2b52c75

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

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

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


}