Merge branch 'rx-1023-营销优惠券新版' into master-prod-new

rx

2023-10-31 8fc8c4954bb9d048b432e6a8dbe801c79ebe357b

 phis-feign/src/main/java/com/hz/his/dto/label/UserLabelEditDto.java

@@ -9,7 +9,7 @@
@Data
public class UserLabelEditDto {

    /**标识父标识*/
    /**是否自定义*/
    private Integer isCustom;
    /**标签类型编号*/
    private String typeNo;