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

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

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

@@ -16,6 +16,8 @@
   private Long id;
   @ApiModelProperty(value = "订单编号")
   private String orderNo;
   @ApiModelProperty(value = "订单状态")
   private Integer orderState;
   @ApiModelProperty(value = "实付金额（元）")
   private BigDecimal actualBalance;
   @ApiModelProperty(value = "下单门店")