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

935090232@qq.com

2021-03-18 5d43370b99a03391c9271d04d3f351f0fd734dae

 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;