Merge branch 'master-prod-new' into fhx-prod-订单升单

fhx

2023-08-24 e09e3c40e9acf5bac969c829a942d6c1e532a895

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