Merge branch 'develop'

jiangyouyao

2022-04-06 556aca9f39838c5a7e72ac86ac64f42f923c5a2a

 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;

}