Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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

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

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


}