From 35b0b9d26bac17adbc22c419c5d95357611d359d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 08 十月 2023 09:59:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
index 816c03d..427a040 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -1,11 +1,9 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.*;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@@ -45,6 +43,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+ @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
@@ -54,6 +53,12 @@
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜")
@ExcelColumn(name="鐢ㄦ埛缂栫爜")
private String memberId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛OpenId")
+ @ExcelColumn(name="鐢ㄦ埛OpenId")
+ @TableField(exist = false)
+ private String memberOpenid;
+
@ApiModelProperty(value = "杞﹁締缂栫爜")
@ExcelColumn(name="杞﹁締缂栫爜")
@@ -67,6 +72,11 @@
@ExcelColumn(name="杞﹁締绫诲瀷缂栫爜")
private String paramId;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷鍚嶇О")
+ @ExcelColumn(name="杞﹁締绫诲瀷鍚嶇О")
+ @TableField(exist = false)
+ private String paramName;
+
@ApiModelProperty(value = "绉熻溅绔欑偣缂栫爜")
@ExcelColumn(name="绉熻溅绔欑偣缂栫爜")
private String rentSiteId;
--
Gitblit v1.9.3