Merge branch 'api_score_meger' into alpha

Helius

2022-02-14 c34b0342177c90564ee5c9d3ef25c7442aaf71ba

 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;