Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-20 b8d9a7cd20dfbaa3c0cc08f3c27e4addd8774e95

 zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java

@@ -19,6 +19,9 @@

    @ApiModelProperty(value = "实付金额")
    private Double  orderMoney;

    @ApiModelProperty(value = "订单状态")
    private Integer orderState;
    
    @ApiModelProperty(value = "下单门店")
    private String storeName;