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

zhangxu

2022-12-26 c92fe3a219cbf3a4006dc91d5fb6fc566fd22d72

 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;
}