From 8676f4cb37ef31fa9fcfe2a7faf5f4c4ea77cc1a Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 29 一月 2026 09:46:05 +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 | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 c563b6a..405d4ab 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
@@ -115,6 +117,10 @@
@TableField(exist = false)
private Integer workYears;
+ @ApiModelProperty("鎿呴暱棰嗗煙鍚嶇О")
+ @TableField(exist = false)
+ private String fieldNames;
+
@ApiModelProperty("宸ヤ綔宀椾綅鍚嶇О")
@TableField(exist = false)
private String promotionName;
@@ -123,10 +129,29 @@
@TableField(exist = false)
private String levelName;
- @ApiModelProperty("鎴樺尯涓婚敭 - 鏌ヨ")
+ @ApiModelProperty("鎴樺尯缂栫爜 - 鏌ヨ")
@TableField(exist = false)
- private String queryZQId;
+ 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 List<Category> fieldList;
+
+ @ApiModelProperty("妗堜緥淇℃伅")
+ @TableField(exist = false)
+ private List<Cases> casesList;
}
--
Gitblit v1.9.3