Merge branch 'master-prod-new'

ANDRU-PC\Andru

2023-05-08 d288633938a13fe59901be5cf5946a4dfd420377

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

@@ -25,11 +25,12 @@
    private String userInviteeName;
    /**所属咨询师*/
    private String userCorpUserName;
    /**所属门店*/
    private String userShopName;
    /**商品名称*/
    private String goodsName;

    /**订单所属门店*/
    private String shopId;
    /**客户所属门店*/
    private String userShopId;

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