Merge branch 'fhx-prod-热门活动' into master-prod-new

fhx

2023-08-07 1f958e1435689b008e04f9d3c6d5133d0c3a9b8c

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