Merge branch 'developer'

姜友瑶

2022-05-23 eaefb5f0d4fb5918786936dd60f4be7dd93011ba

 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;

}