Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

rx

2023-10-26 e0a35f3912912fb3a160ee2633594a2e6c828abc

 phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java

@@ -11,8 +11,12 @@
    private Integer pageNum;
    // 每页数量
    private Integer pageSize;
    // 顾问id
    private String employeeId;
    // 用户id
    private String userId;
    // 公共类型
    private String commonType;
    // 公共标识
    private String commonId;
    // 公共名称