Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-29 835f6562bd7a83fd156c0bc8b9e48b3e6fe3f5ee

 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;