Merge branch 'master-prod-new' into master-test

fwq

2024-05-17 2a28984276e51d5f6635f3ae62b982b30c442bfd

 phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java

@@ -11,10 +11,16 @@
@Data
public class LabelVo {

    /**标签标识*/
    /**用户标签标识*/
    private String id;
    /**系统标签标识*/
    private String labelId;
    /**系统标签分类标识*/
    private String labelTypeId;
    /**标签名称*/
    private String name;
    /**是否自定义标签：0否1是*/
    private Integer isCustom;

    public LabelVo() {
    }
@@ -23,4 +29,12 @@
        this.id = id;
        this.name = name;
    }

    public LabelVo(String id,String labelTypeId,String labelId, String name, Integer isCustom) {
        this.id = id;
        this.labelTypeId = labelTypeId;
        this.labelId = labelId;
        this.name = name;
        this.isCustom = isCustom;
    }
}