Merge branch 'master' into master-test

wangrenhuang

2023-11-06 155905061b3aa29d2aa23e5693e8704debfb9828

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java

@@ -16,7 +16,7 @@
    private String title;
    /**申请类型**/
    private Integer type;
    /**指定项目 或者 通用项目 类型 0=通用 1=指定 **/
    /**指定项目 或者 通用项目 类型 0=指定 1=通用 **/
    private Integer useProjectType;
    /**指定项目 或者 通用项目 ID,name **/
    private List<Map<String,Object>> serviceIds;