From e685b58fd40cf28a20844643d70cc5f5b46ca037 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 10 四月 2026 11:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 03ff91f..b52946e 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
@@ -67,13 +67,13 @@
@ExcelColumn(name="鐪熷疄濮撳悕",index = 4,width = 10)
private String name;
- @ApiModelProperty(value = "鐢ㄥ伐韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
+ @ApiModelProperty(value = "鐢ㄥ伐韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1") //寮冪敤
private Integer workerIdentity;
- @ApiModelProperty(value = "璐ц繍韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
+ @ApiModelProperty(value = "璐ц繍韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1") //寮冪敤
private Integer driverIdentity;
- @ApiModelProperty(value = "渚涢韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
+ @ApiModelProperty(value = "渚涢韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1") //寮冪敤
private Integer chefIdentity;
@ApiModelProperty(value = "褰撳墠浣欓(鍗曚綅:鍒�)", example = "1")
@@ -82,7 +82,7 @@
@ApiModelProperty(value = "鍘嗗彶鎬婚噾棰�(鍗曚綅:鍒�)", example = "1")
private Long totalAmount;
- @ApiModelProperty(value = "鐘舵��", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0=姝ｅ父锛�1=鍋滅敤锛�2=宸叉敞閿�", example = "1")
private Integer status;
@ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
@@ -134,6 +134,19 @@
@ApiModelProperty(value = "褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;", example = "1")
private Integer useIdentity;
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=浼氬憳鐢ㄦ埛锛�1=鍙告満锛�2=搴楅摵浜哄憳锛�(鍙告満涓庡簵閾哄潎鍜屼細鍛樿〃浣跨敤鍚屼富閿��)", example = "1")
+ private Integer userType;
+
+ @ApiModelProperty(value = "涓氬姟鐘舵�侊細0=鏈璇侊紱1=璁よ瘉閫氳繃锛�2=璁よ瘉鏈�氳繃 锛�3=宸叉敮浠樻娂閲�", example = "1")
+ private Integer businessStatus;
+
+ @ApiModelProperty(value = "鐧诲綍瀵嗙爜", example = "1")
+ private String password;
+
+ @ApiModelProperty(value = "瀵嗙爜鐩�", example = "1")
+ private String salt;
+
+
@ApiModelProperty(value = "鎴戠殑 - 鏁版嵁淇℃伅", example = "1")
@TableField(exist = false)
private UserCenterVO userCenterVO;
--
Gitblit v1.9.3