From 9cbe73873e3b523a3eaa12051084a5f5191760ef Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 02 Jun 2023 17:46:26 +0800
Subject: [PATCH] 1、nacos dev 地址改为8848 2、行政区划支持查询第四级 3、物资管理、队伍管理查询接口修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java
index 3333e30..611ea87 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java
@@ -1,5 +1,7 @@
 package cn.gistack.sm.materials.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -37,15 +39,24 @@
 	 * 城市
 	 */
 	@ApiModelProperty(value = "城市")
+	@TableField(value = "city",updateStrategy = FieldStrategy.IGNORED)
 	private String city;
 
 	/**
 	 * 乡镇
 	 */
-	@ApiModelProperty(value = "乡镇")
+	@ApiModelProperty(value = "区县")
+	@TableField(value = "county",updateStrategy = FieldStrategy.IGNORED)
 	private String county;
 
 	/**
+	 * 乡镇
+	 */
+	@ApiModelProperty(value = "乡镇")
+	@TableField(value = "town",updateStrategy = FieldStrategy.IGNORED)
+	private String town;
+
+	/**
 	 * 物资类型
 	 */
 	@ApiModelProperty(value = "物资类型")

--
Gitblit v1.9.3