From 90615ce702dde7f1d8fed373d8f3a96796ef1f2d Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 21 十一月 2024 09:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/hc-recheck-1114'

---
 pom.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6d4c67e..a439640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -437,8 +437,8 @@
                 <artifactId>mybatis-generator-maven-plugin</artifactId>
                 <version>1.3.2</version>
                 <configuration>
-                    <!--                    <configurationFile>src/main/resources/generator/generatorConfig4ds1.xml</configurationFile>-->
-                    <configurationFile>src/main/resources/generator/generatorConfig4ds3.xml</configurationFile>
+                    <configurationFile>src/main/resources/generator/generatorConfig4ds1.xml</configurationFile>
+<!--                    <configurationFile>src/main/resources/generator/generatorConfig4ds3.xml</configurationFile>-->
                     <overwrite>true</overwrite>
                     <verbose>true</verbose>
                 </configuration>
@@ -499,6 +499,12 @@
             </properties>
         </profile>
         <profile>
+            <id>pro-https</id>
+            <properties>
+                <profileActive>pro-https</profileActive>
+            </properties>
+        </profile>
+        <profile>
             <id>test</id>
             <properties>
                 <profileActive>test</profileActive>

--
Gitblit v1.9.3