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

fwq

2023-05-06 c0c3ba60f8620d2700c76afb62732ef940c38c70

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