Merge branch 'score_shop' into api_score_meger

jyy

2021-07-15 a43e210f39562bbbdc25f75ec3aaad94ae33dfbf

 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;