Merge branch 'master-fwq-积分抵扣现金' into master-test

fwq

2024-04-24 1b6aaa7d6c379ccdb0870a36f848c1f811577bf0

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