Merge remote-tracking branch 'origin/rx0711-回访优化' into master-test

rx

2024-07-12 6a9d4b49c03781bbb49a41f1d16e510baa2881aa

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

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

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


}