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/LabelFindVo.java

@@ -7,8 +7,9 @@
 */
@Data
public class LabelFindVo {

    /**范围标识*/
    /**范围标识-新(因为旧字段的处理查询被屏蔽)*/
    private String rangeCodeNew;
    /**范围标识-旧*/
    private String rangeCode;
    /**用户标识*/
    private String userId;