Merge branch 'master-prod-new' into master-fwq-爆款活动2.0

fwq

2024-06-13 653a27e1cc457f7bc887a6aa81ff00717e4282f4

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