Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2024-02-22 0ff6f9c85c9b89f6328956cc5764b16f789fc94f

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

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

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


}