Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/hive/pojo/CzXkVo.java

@@ -1,6 +1,7 @@
package com.matrix.system.hive.pojo;

import com.matrix.system.hive.bean.AchieveNew;
import com.matrix.system.hive.bean.SysOrderFlow;

import java.util.List;

@@ -17,8 +18,17 @@
   private Long staffId;
   private Long vipId;
   private List<AchieveNew> achaeveList;
	
	 

   private List<SysOrderFlow> flows;

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

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

   public Long getCardId() {
      return cardId;
   }