From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期日, 29 九月 2024 15:05:11 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia --- server/service/src/main/java/com/doumee/dao/business/model/Users.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Users.java b/server/service/src/main/java/com/doumee/dao/business/model/Users.java index 962847e..c17cb75 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/Users.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/Users.java @@ -90,7 +90,7 @@ @ExcelColumn(name="寰俊openid") private String openid; - @ApiModelProperty(value = "璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤", example = "1") + @ApiModelProperty(value = "璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤锛�-1鍒犻櫎", example = "1") @ExcelColumn(name="璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤") private String status; @@ -161,6 +161,9 @@ @ApiModelProperty(value = "閭") @ExcelColumn(name="閭") private String email; + @ApiModelProperty(value = "鍚嶇墖") + @ExcelColumn(name="鍚嶇墖") + private String cardImg; @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛屽尯鍒咹R鍐呴儴鍛樺伐鍜屽姞鐩熷晢鍛樺伐锛�10001鍔犵洘鍟嗭紝10002HR鍐呴儴鍛樺伐锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑") @ExcelColumn(name="鐢ㄦ埛绫诲瀷锛屽尯鍒咹R鍐呴儴鍛樺伐鍜屽姞鐩熷晢鍛樺伐锛�10001鍔犵洘鍟嗭紝10002HR鍐呴儴鍛樺伐锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑") @@ -197,6 +200,21 @@ @ApiModelProperty(value = "闂ㄥ簵鍦板潃") @TableField(exist = false) private String shopAddress; + @ApiModelProperty(value = "闂ㄥ簵鍩庡競") + @TableField(exist = false) + private String shopCity; + @ApiModelProperty(value = "鏄惁鍙鐞嗛棬搴�") + @TableField(exist = false) + private Boolean manageShop; + + @ApiModelProperty(value = "C绔敤鎴锋墜鏈哄彿",notes = "鐢ㄤ簬鏌ヨ鐢ㄦ埛缁戝畾鐨勫璐�",hidden = true) + @TableField(exist = false) + private String memberPhone; + + @ApiModelProperty(value = "C绔敤鎴蜂富閿�",notes = "鐢ㄤ簬鏌ヨ鐢ㄦ埛缁戝畾鐨勫璐�",hidden = true) + @TableField(exist = false) + private Long memberId; + @ApiModelProperty(value = "浼佷笟浜岀淮鐮佸浘鐗囧畬鏁村湴鍧�") @TableField(exist = false) -- Gitblit v1.9.3