From cde49794973557adda93091606a9820e7fddb46f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 17:03:58 +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/Bikes.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
index 422aa82..d13a64e 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -57,6 +58,12 @@
@ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)")
@ExcelColumn(name="杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)")
private String paramId;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷")
+ @TableField(exist = false)
+ private String paramName;
+ @ApiModelProperty(value = "绔欑偣鍚嶇О")
+ @TableField(exist = false)
+ private String siteName;
@ApiModelProperty(value = "缂栧彿")
@ExcelColumn(name="缂栧彿")
@@ -65,6 +72,9 @@
@ApiModelProperty(value = "鐘舵�� 0鍋滆溅鍙嚭鍊� 1鍑哄�熶腑 3绂佺敤 ", example = "1")
@ExcelColumn(name="鐘舵�� 0鍋滆溅鍙嚭鍊� 1鍑哄�熶腑 3绂佺敤 ")
private Integer status;
+ @ApiModelProperty(value = "鏄惁鏈夎溅 0鍏ㄩ儴 1鏃犺溅 2鏈夎溅 null涓哄叏閮�", example = "1")
+ @TableField(exist = false)
+ private Integer hasBike;
@ApiModelProperty(value = "褰撳墠绔欑偣缂栫爜锛堝叧鑱攕ites)")
@ExcelColumn(name="褰撳墠绔欑偣缂栫爜锛堝叧鑱攕ites)")
--
Gitblit v1.9.3