From 26887959cdd63309344c5f31e3f5387cd08aafa6 Mon Sep 17 00:00:00 2001
From: EightMonth <eightmonth@qq.com>
Date: Mon, 3 Mar 2025 14:27:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20#7613?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/jeecg/code-template-online/common/blob.ftl    | 6 +++---
 .../${entityPackage}/vo/${entityName}Page.javai             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/blob.ftl b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/blob.ftl
index 833f5a7d3..eb85ea9c4 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/blob.ftl
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/blob.ftl
@@ -39,11 +39,11 @@
         </#if>
     </#list>
     @Excel(name = "${po.filedComment}", width = 15,replace = {"是_${switch_extend_arr1}","否_${switch_extend_arr2}"} )
-    @ApiModelProperty(value = "${po.filedComment}")
+    @Schema(description = "${po.filedComment}")
     private ${po.fieldType} ${po.fieldName};
 <#elseif po.classType=='pca'>
     @Excel(name = "${po.filedComment}", width = 15,exportConvert=true,importConvert = true )
-    @ApiModelProperty(value = "${po.filedComment}")
+    @Schema(description = "${po.filedComment}")
     private ${po.fieldType} ${po.fieldName};
 
     public String convertis${po.fieldName?cap_first}() {
@@ -56,7 +56,7 @@
 <#elseif po.classType=='cat_tree'>
     <#assign list_field_dictCode=', dictTable = "sys_category", dicText = "name", dicCode = "id"'>
     @Excel(name = "${po.filedComment}", width = 15${list_field_dictCode})
-    @ApiModelProperty(value = "${po.filedComment}")
+    @Schema(description = "${po.filedComment}")
     private ${po.fieldType} ${po.fieldName};
 <#else>
     @Schema(description = "${po.filedComment}")
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
index 8ae8c7a26..9d851fb2f 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
@@ -109,7 +109,7 @@ public class ${entityName}Page {
 	
 	<#list subTables as sub>
 	@ExcelCollection(name="${sub.ftlDescription}")
-	@ApiModelProperty(value = "${sub.ftlDescription}")
+	@Schema(description = "${sub.ftlDescription}")
 	private List<${sub.entityName}> ${sub.entityName?uncap_first}List;
 	</#list>
 	

From 03265691e6450fec8aae0e253c1efc27187e6df3 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Tue, 11 Mar 2025 09:43:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=A5=E9=87=8Dbug,War?=
 =?UTF-8?q?=E5=8C=85=E6=96=B9=E5=BC=8F=E9=83=A8=E7=BD=B2=EF=BC=8C=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecg-boot/pom.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index 4420f187b..3b1d50a06 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -53,13 +53,12 @@
 		<kingbase8.version>9.0.0</kingbase8.version>
 		<dm8.version>8.1.1.49</dm8.version>
 
-
 		<!-- 积木报表-->
 		<jimureport-spring-boot-starter.version>1.9.4</jimureport-spring-boot-starter.version>
 		<!-- 持久层 -->
 		<mybatis-plus.version>3.5.3.2</mybatis-plus.version>
 		<dynamic-datasource-spring-boot-starter.version>4.1.3</dynamic-datasource-spring-boot-starter.version>
-		<druid.version>1.2.22</druid.version>
+		<druid.version>1.2.24</druid.version>
 
 		<commons-io.version>2.11.0</commons-io.version>
 		<commons.version>2.6</commons.version>
@@ -384,8 +383,8 @@
 			<!-- 企业微信和钉钉 api -->
 			<dependency>
 				<groupId>org.jeecgframework</groupId>
-				<artifactId>jeewx-api</artifactId>
-				<version>1.5.2</version>
+				<artifactId>weixin4j</artifactId>
+				<version>2.0.0</version>
 				<exclusions>
 					<exclusion>
 						<artifactId>commons-beanutils</artifactId>
@@ -428,7 +427,13 @@
 			<dependency>
 				<groupId>org.jeecgframework.jimureport</groupId>
 				<artifactId>jimureport-nosql-starter</artifactId>
-                <version>${jimureport-spring-boot-starter.version}</version>
+				<version>1.9.4.1</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.apache.calcite</groupId>
+						<artifactId>calcite-elasticsearch</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
             <!-- 积木BI大屏和仪表盘 -->
             <dependency>
@@ -442,7 +447,6 @@
 				<artifactId>jeecg-boot-starter3-chatgpt</artifactId>
 				<version>${jeecgboot.version}</version>
 			</dependency>
-
 			<!--flyway 支持 mysql5.7+、MariaDB10.3.16-->
 			<!--mysql5.6，需要把版本号改成5.2.1-->
 			<dependency>