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

fhx

2024-06-06 81cf1e143db817a3ac7b9eb1f3042b766db1b14f

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