Merge branch 'master-fwq-积分抵扣现金' into master-prod-new

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

 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;