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

jyy

2021-03-16 67e2e142e752b724e021f3562c7f28e128e6f118

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