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

935090232@qq.com

2021-10-06 23acc4e7eb8673e918620586b96eae25c3e651b2

 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;