Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

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

@@ -15,6 +15,4 @@
    private String labelId;
    /**标签名称-选填（isCustom是1必填）*/
    private String labelName;
    /**是否自动打标签：0否1是-自动打标签必填*/
    private Integer isAuto = 0;
}