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

fwq

2024-05-24 b28a5cde3ddcb7ab1eda3b612014bdf2e717af5b

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

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

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


}