Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-02-18 4506cc81e35921635299078ca24f7dfc92408e1c

 zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderBasicVo.java

@@ -17,4 +17,7 @@
   @ApiModelProperty(value = "待结算订单")
   private Integer waitOrderNum;

   @ApiModelProperty(value = "订单金额")
   private BigDecimal orderBalance;

}