From 819c0b6478fb3385c8457cd03e04fdf0d3b90a70 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 21 五月 2024 10:11:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java | 76 ++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java
index b5b3d48..506b333 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java
@@ -32,8 +32,7 @@
@Excel(name = "鎻忚堪銆佹妧鏈姹�")
private String description;
- /** 鍕樻帰鐐圭被鍨嬶紙1-鎺簳銆�2-閽诲瓟锛� */
- @Excel(name = "鍕樻帰鐐圭被鍨�", readConverterExp = "1=-鎺簳銆�2-閽诲瓟")
+ /** 鍕樻帰鐐圭被鍨� */
private String type;
/** 瀛斿彛楂樼▼ */
@@ -98,17 +97,15 @@
@Excel(name = "鏃犳硶瀹氫綅鐨勫師鍥�")
private String reason;
- /** 鐜板満鎷嶇収1 */
- @Excel(name = "鐜板満鎷嶇収1")
- private String pic1;
- /** 鐜板満鎷嶇収2 */
- @Excel(name = "鐜板満鎷嶇収2")
- private String pic2;
+ /** 褰撳墠杩涘害 footageCpl/footage */
+ private Double rate;
- /** 鐜板満鎷嶇収3 */
- @Excel(name = "鐜板満鎷嶇収3")
- private String pic3;
+ /** 鎬昏繘灏� */
+ private Double footage;
+
+ /** 宸插畬鎴愯繘灏� */
+ private Double footageCpl;
/** 閽诲瓟鐘舵�� */
@Excel(name = "閽诲瓟鐘舵��")
@@ -120,6 +117,31 @@
/** 鏄惁琚紓甯告壂鎻忥紙0-鏈壂鎻忥紝1-宸叉壂鎻忥級 */
private String isFlag;
+
+ public Double getRate() {
+ return rate;
+ }
+
+ public void setRate(Double rate) {
+ this.rate = rate;
+ }
+
+ public Double getFootage() {
+ return footage;
+ }
+
+ public void setFootage(Double footage) {
+ this.footage = footage;
+ }
+
+ public Double getFootageCpl() {
+ return footageCpl;
+ }
+
+ public void setFootageCpl(Double footageCpl) {
+ this.footageCpl = footageCpl;
+ }
+
public void setIds(String ids)
{
@@ -301,33 +323,7 @@
{
return reason;
}
- public void setPic1(String pic1)
- {
- this.pic1 = pic1;
- }
- public String getPic1()
- {
- return pic1;
- }
- public void setPic2(String pic2)
- {
- this.pic2 = pic2;
- }
-
- public String getPic2()
- {
- return pic2;
- }
- public void setPic3(String pic3)
- {
- this.pic3 = pic3;
- }
-
- public String getPic3()
- {
- return pic3;
- }
public void setStatus(String status)
{
this.status = status;
@@ -380,9 +376,9 @@
.append("position", getPosition())
.append("locateTime", getLocateTime())
.append("reason", getReason())
- .append("pic1", getPic1())
- .append("pic2", getPic2())
- .append("pic3", getPic3())
+ .append("rate", getRate())
+ .append("footage", getFootage())
+ .append("footageCpl", getFootageCpl())
.append("status", getStatus())
.append("isDeleted", getIsDeleted())
.append("isFlag", getIsFlag())
--
Gitblit v1.9.1