From 0c3a8ceed71042ef8760ee09db37a7b2f090b0c0 Mon Sep 17 00:00:00 2001
From: masong <ms@cjy.com>
Date: Mon, 27 Feb 2023 19:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EnterpriseInfoController.java          |  3 ++-
 .../com/cjy/enterprise/domain/EnterpriseInfo.java     | 11 +++++------
 .../mapper/enterprise/EnterpriseInfoMapper.xml        | 10 +++++-----
 ruoyi-generator/src/main/resources/generator.yml      |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cjy-project/src/main/java/com/cjy/enterprise/controller/EnterpriseInfoController.java b/cjy-project/src/main/java/com/cjy/enterprise/controller/EnterpriseInfoController.java
index b787adcd..0fc5c4af 100644
--- a/cjy-project/src/main/java/com/cjy/enterprise/controller/EnterpriseInfoController.java
+++ b/cjy-project/src/main/java/com/cjy/enterprise/controller/EnterpriseInfoController.java
@@ -13,6 +13,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,7 +28,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-02-19
  */
-@Api("企业基础信息控制器")
+ @Api(tags = "企业基础信息控制器")
 @RestController
 @RequestMapping("/enterprise")
 public class EnterpriseInfoController extends BaseController {
diff --git a/cjy-project/src/main/java/com/cjy/enterprise/domain/EnterpriseInfo.java b/cjy-project/src/main/java/com/cjy/enterprise/domain/EnterpriseInfo.java
index c99712fd..3471c025 100644
--- a/cjy-project/src/main/java/com/cjy/enterprise/domain/EnterpriseInfo.java
+++ b/cjy-project/src/main/java/com/cjy/enterprise/domain/EnterpriseInfo.java
@@ -56,7 +56,7 @@ public class EnterpriseInfo extends BaseEntity {
     /**
      * 是否是组织机构 1:是 2:否
      */
-    private Integer isOrgan;
+    private Integer organ;
 
     /**
      * 联系人
@@ -159,12 +159,12 @@ public class EnterpriseInfo extends BaseEntity {
         return dimension;
     }
 
-    public void setIsOrgan(Integer isOrgan) {
-        this.isOrgan = isOrgan;
+    public Integer getOrgan() {
+        return organ;
     }
 
-    public Integer getIsOrgan() {
-        return isOrgan;
+    public void setOrgan(Integer organ) {
+        this.organ = organ;
     }
 
     public void setContactPerson(String contactPerson) {
@@ -232,7 +232,6 @@ public class EnterpriseInfo extends BaseEntity {
                 .append("address", getAddress())
                 .append("accuracy", getAccuracy())
                 .append("dimension", getDimension())
-                .append("isOrgan", getIsOrgan())
                 .append("contactPerson", getContactPerson())
                 .append("contactNumber", getContactNumber())
                 .append("websiteUrl", getWebsiteUrl())
diff --git a/cjy-project/src/main/resources/mapper/enterprise/EnterpriseInfoMapper.xml b/cjy-project/src/main/resources/mapper/enterprise/EnterpriseInfoMapper.xml
index 473b08f1..5f4e1e86 100644
--- a/cjy-project/src/main/resources/mapper/enterprise/EnterpriseInfoMapper.xml
+++ b/cjy-project/src/main/resources/mapper/enterprise/EnterpriseInfoMapper.xml
@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address"    column="address"    />
         <result property="accuracy"    column="accuracy"    />
         <result property="dimension"    column="dimension"    />
-        <result property="isOrgan"    column="is_organ"    />
+        <result property="organ"    column="is_organ"    />
         <result property="contactPerson"    column="contact_person"    />
         <result property="contactNumber"    column="contact_number"    />
         <result property="websiteUrl"    column="website_url"    />
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address"    column="address"    />
         <result property="accuracy"    column="accuracy"    />
         <result property="dimension"    column="dimension"    />
-        <result property="isOrgan"    column="is_organ"    />
+        <result property="organ"    column="is_organ"    />
         <result property="contactPerson"    column="contact_person"    />
         <result property="contactNumber"    column="contact_number"    />
         <result property="websiteUrl"    column="website_url"    />
@@ -77,7 +77,7 @@ order by e.id desc
             <if test="address != null">address,</if>
             <if test="accuracy != null">accuracy,</if>
             <if test="dimension != null">dimension,</if>
-            <if test="isOrgan != null">is_organ,</if>
+            <if test="organ != null">is_organ,</if>
             <if test="contactPerson != null">contact_person,</if>
             <if test="contactNumber != null">contact_number,</if>
             <if test="websiteUrl != null">website_url,</if>
@@ -99,7 +99,7 @@ order by e.id desc
             <if test="address != null">#{address},</if>
             <if test="accuracy != null">#{accuracy},</if>
             <if test="dimension != null">#{dimension},</if>
-            <if test="isOrgan != null">#{isOrgan},</if>
+            <if test="organ != null">#{organ},</if>
             <if test="contactPerson != null">#{contactPerson},</if>
             <if test="contactNumber != null">#{contactNumber},</if>
             <if test="websiteUrl != null">#{websiteUrl},</if>
@@ -125,7 +125,7 @@ order by e.id desc
             <if test="address != null">address = #{address},</if>
             <if test="accuracy != null">accuracy = #{accuracy},</if>
             <if test="dimension != null">dimension = #{dimension},</if>
-            <if test="isOrgan != null">is_organ = #{isOrgan},</if>
+            <if test="organ != null">is_organ = #{organ},</if>
             <if test="contactPerson != null">contact_person = #{contactPerson},</if>
             <if test="contactNumber != null">contact_number = #{contactNumber},</if>
             <if test="websiteUrl != null">website_url = #{websiteUrl},</if>
diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml
index 5bd3dd67..96094956 100644
--- a/ruoyi-generator/src/main/resources/generator.yml
+++ b/ruoyi-generator/src/main/resources/generator.yml
@@ -5,6 +5,6 @@ gen:
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
   packageName: com.ruoyi.system
   # 自动去除表前缀，默认是false
-  autoRemovePre: false
+  autoRemovePre: true
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_
\ No newline at end of file
+  tablePrefix: sys_,ti_,ec_
\ No newline at end of file