Merge branch 'master-fwq组织架构优化' into master-test

fwq

2024-01-03 07e60bfa19de8bc7231b272872c5ba3fdf5fd82f

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

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

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


}