Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-29 835f6562bd7a83fd156c0bc8b9e48b3e6fe3f5ee

 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 = "下单门店")