Merge remote-tracking branch 'origin/score_shop' into developer

姜友瑶

2022-05-17 e11162164d7b136e9de4c4b2e378b108cd87859f

 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;

}