Merge branch 'master' into master-test

wangrenhuang

2023-10-23 85d1dc328bd46089b63b57bd356908cbba26e29c

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

@@ -7,12 +7,16 @@
 * */
@Data
public class RefundProjectDto {
    /**退的项目标识*/
    /**退的类型: OrderItemConstants*/
    private String projectType;
    /**退的标识 商品/项目/...*/
    private String projectId;
    /**退的项目编号*/
    /**退的编号 商品/项目/...*/
    private String projectNo;
    /**退的项目名称*/
    /**退的名称 商品/项目/... - 必填*/
    private String projectName;
    /**退的项目数量*/
    /**退的数量 商品/项目/... - 必填*/
    private Integer refundNum;
    /**买的数量 商品/项目/...*/
    private Integer buyNum;
}