From 65f21b7d0a1cf099c2b1576a6d6c1bbc45d5dd32 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Tue, 13 Jun 2023 01:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=86=E5=8F=B2=E7=BB=93?=
=?UTF-8?q?=E7=AE=97;=20=E6=96=B0=E5=A2=9E=E7=A7=9F=E5=8D=95=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/gxwebsoft/tower/entity/TowerEquipment.java | 8 ++++++++
src/main/java/com/gxwebsoft/tower/entity/TowerFall.java | 2 +-
.../gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml | 6 +++---
src/test/java/com/gxwebsoft/generator/TowerGenerator.java | 4 +++-
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java
index e0845ff..66ae848 100644
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java
+++ b/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java
@@ -32,9 +32,17 @@ public class TowerEquipment implements Serializable {
@ApiModelProperty(value = "设备名称")
private String name;
+ @ApiModelProperty(value = "设备名称")
+ @TableField(exist = false)
+ private String equipmentName;
+
@ApiModelProperty(value = "设备型号")
private String model;
+ @ApiModelProperty(value = "设备型号")
+ @TableField(exist = false)
+ private String equipmentModel;
+
@ApiModelProperty(value = "设备编号")
private String equipmentNo;
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java b/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java
index c7d2446..0660b1f 100644
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java
+++ b/src/main/java/com/gxwebsoft/tower/entity/TowerFall.java
@@ -42,7 +42,7 @@ public class TowerFall implements Serializable {
private Integer companyId;
@ApiModelProperty(value = "产权单位名称")
- @TableField(exist = false)
+// @TableField(exist = false)
private String companyName;
@ApiModelProperty(value = "出厂日期")
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml
index 08b47b3..c2ecbef 100644
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml
+++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml
@@ -49,9 +49,9 @@
AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-
- AND a.username = #{param.username}
-
+
+
+
AND a.deleted = #{param.deleted}
diff --git a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java
index d4e2044..434eb07 100644
--- a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java
+++ b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java
@@ -48,8 +48,10 @@ public class TowerGenerator {
// "tower_model"
// "tower_contract",
// "tower_contract_equipment",
- "tower_settle",
+// "tower_settle",
// "tower_settle_detail",
+// "tower_history_settle",
+ "tower_rent_record",
};
// 需要去除的表前缀
private static final String[] TABLE_PREFIX = new String[]{