Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

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

@@ -7,10 +7,12 @@
 */
@Data
public class UserLabelInfoVo {
    /**用户标签标识*/
    private String id;
    /**是否自定义：0否1是-必填*/
    private Integer isCustom;
    /**系统标签标识-选填（isCustom是0必填）*/
    private String labelId;
    /**标签标识-选填（isCustom是1必填）*/
    /**标签名称-选填（isCustom是1必填）*/
    private String labelName;
}