Merge branch 'master-prod-new' into master-test

fhx

2024-05-18 cb698b6c5a1ebeeb1efdff4b8ca62f00f4612b85

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