Merge remote-tracking branch 'origin/master-test' into master-test

fwq

2024-05-13 f52dc5114638600e934cc82fe63c4a25f22594cc

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

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

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


}