From acf90ad8e6bea592124541324467360cef565ff5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 二月 2026 14:14:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang
---
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 78 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Member.java b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
index cdc5bed..0598154 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
@@ -11,6 +11,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
+
/**
* 浼氬憳淇℃伅琛∕odel瀹氫箟
* @author doumee
@@ -70,6 +72,10 @@
@ApiModelProperty("鍟嗕笟鍖栫被鍨嬬紪鐮侀泦鍚堬紙[1],[2],...]锛�")
@ExcelColumn(name="鍟嗕笟鍖栫被鍨嬬紪鐮侀泦鍚堬紙[1],[2],...]锛�",index=16 ,width=10)
private String bustypeIds;
+ @ApiModelProperty("鎿呴暱棰嗗煙闆嗗悎锛圼1],[2],...]锛�")
+ private String fieldIds;
+ @ApiModelProperty("宸ュ彿")
+ private String code;
@ApiModelProperty("璁插笀绛夌骇缂栫爜锛堝叧鑱攃ategory锛�")
@ExcelColumn(name="璁插笀绛夌骇缂栫爜锛堝叧鑱攃ategory锛�",index=17 ,width=10)
private Integer levelId;
@@ -106,4 +112,76 @@
@ApiModelProperty("瀵煎叆璁板綍缂栫爜锛堝叧鑱攊mport_record)")
@ExcelColumn(name="瀵煎叆璁板綍缂栫爜锛堝叧鑱攊mport_record)",index=28 ,width=10)
private Integer importId;
+
+ @ApiModelProperty("宸ヤ綔骞存暟")
+ @TableField(exist = false)
+ private Integer workYears;
+
+ @ApiModelProperty("鎿呴暱棰嗗煙鍚嶇О")
+ @TableField(exist = false)
+ private String fieldNames;
+
+ @ApiModelProperty("宸ヤ綔宀椾綅鍚嶇О")
+ @TableField(exist = false)
+ private String promotionName;
+
+ @ApiModelProperty("绾у埆鍚嶇О")
+ @TableField(exist = false)
+ private String levelName;
+
+ @ApiModelProperty("鎴樺尯缂栫爜 - 鏌ヨ")
+ @TableField(exist = false)
+ private String queryZQCode;
+
+ @ApiModelProperty("鎺掑簭淇℃伅锛�0=鏀惰垂浠庨珮鍒颁綆锛�1=鏀惰垂浠庝綆鍒伴珮锛�2=绛夌骇浠庨珮鍒颁綆锛�3=绛夌骇浠庝綆鍒伴珮锛�4=鏈嶅姟鏁颁粠楂樺埌浣�")
+ @TableField(exist = false)
+ private Integer orderByType;
+
+ @ApiModelProperty("璇佷欢鐓у叏璺緞")
+ @TableField(exist = false)
+ private String fullImgurl;
+
+ @ApiModelProperty("鏌ヨ鐢ㄦ埛绫诲瀷")
+ @TableField(exist = false)
+ private String queryUserRole;
+ @ApiModelProperty("鏍囨潌妗堜緥鏁伴噺")
+ @TableField(exist = false)
+ private Integer caseNum;
+ @ApiModelProperty("鏌ヨ鍏ュ彛 1鍚庡彴")
+ @TableField(exist = false)
+ private Integer queryFlag ;
+
+ @ApiModelProperty("鎿呴暱棰嗗煙")
+ @TableField(exist = false)
+ private List<Category> fieldList;
+ @ApiModelProperty("鎿呴暱棰嗗煙")
+ @TableField(exist = false)
+ private List<Integer> fieldIdList;
+ @ApiModelProperty("鍟嗕笟鍖栫被鍨嬬紪鐮侀泦鍚�")
+ @TableField(exist = false)
+ private List<Integer> bustypeIdList;
+ @ApiModelProperty("鎴樺尯缂栫爜闆嗗悎")
+ @TableField(exist = false)
+ private List<Integer> zhanquIdList;
+ @ApiModelProperty("鎴樺尯闆嗗悎")
+ @TableField(exist = false)
+ private List<Category> zqList;
+ @ApiModelProperty("鍟嗕笟鍖栫被鍨�")
+ @TableField(exist = false)
+ private List<Category> typeList;
+
+ @ApiModelProperty("妗堜緥淇℃伅")
+ @TableField(exist = false)
+ private List<Cases> casesList;
+
+ @TableField(exist = false)
+ private byte[] imgurlData;
+
+
+ @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉鍛橈紱", example = "1")
+ @TableField(exist = false)
+ private String updateUserName;
+ @ApiModelProperty(value = "鏄惁鍖呭惈宸插垹闄� 0涓嶅寘鍚� 1鍖呭惈锛�", example = "1")
+ @TableField(exist = false)
+ private int containDeleted;
}
--
Gitblit v1.9.3