Merge branch 'master-prod-new'

ANDRU-PC\Andru

2023-06-21 7360e71cf80fc11b070cd656247aeabf1dee5584

Merge branch 'master-prod-new'

 phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java

@@ -32,6 +32,8 @@
    private String shopId;
    /**客户所属门店*/
    private String userShopId;
    /**销售平台*/
    private String sourceName;

    /*******保存参数********/
    /**操作人标识*/