Merge branch 'api' into order_reform

wzy

2021-01-10 16da0ad1fda1dffa3019425a6887d38ed4217f44

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java

@@ -115,6 +115,8 @@
    * 订单明细
    */
   private List<SysOrderItem> items;

   private List<SysOrderFlow> flows;
   /**
    * 会员姓名
    */
@@ -163,6 +165,14 @@

   private String type;

   public List<SysOrderFlow> getFlows() {
      return flows;
   }

   public void setFlows(List<SysOrderFlow> flows) {
      this.flows = flows;
   }

   public String getType() {
      return type;
   }