Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java

@@ -6,6 +6,7 @@
import org.yeshi.utils.mybatis.Table;



import com.google.gson.annotations.Expose;

import com.yeshi.fanli.dto.money.ExtractOrderStatisticDTO;

import com.yeshi.fanli.entity.common.AdminUser;



/**

@@ -62,6 +63,28 @@
   @Expose // 风险等级

   private int warnLevel;

   

   @Expose

   private ExtractOrderStatisticDTO extraInfo;//extraInfoStr对象

	
   @Column(name = "extraInfo")

   private String extraInfoStr;//附加信息JSON格式

	
   public ExtractOrderStatisticDTO getExtraInfo() {

      return extraInfo;

   }



   public void setExtraInfo(ExtractOrderStatisticDTO extraInfo) {

      this.extraInfo = extraInfo;

   }



   public String getExtraInfoStr() {

      return extraInfoStr;

   }



   public void setExtraInfoStr(String extraInfoStr) {

      this.extraInfoStr = extraInfoStr;

   }



   public String getAuditRole() {

      return auditRole;

   }