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

wangrenhuang

2022-11-21 d9ec5419cb3c8dacd50111498d34c138858a08e7

 phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java

@@ -15,4 +15,6 @@
    private String shopId;
    /**字典资质编码*/
    private String qualificationNo;
    /**是否上架展示*/
    private Integer isUp;
}