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

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

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

@@ -13,6 +13,8 @@
    private String userId;
    /**范围标识-必填*/
    private String rangeCode;
    /**用户标签分类集合*/
    /**新增/修改用户标签分类集合*/
    private List<UserLabelTypeVo> userLabelTypeList;
    /**删除用户标签集合*/
    private List<String> deleteLabelList;
}