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 @@ @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; 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 @@ 9.0.0 8.1.1.49 - 1.9.4 3.5.3.2 4.1.3 - 1.2.22 + 1.2.24 2.11.0 2.6 @@ -384,8 +383,8 @@ org.jeecgframework - jeewx-api - 1.5.2 + weixin4j + 2.0.0 commons-beanutils @@ -428,7 +427,13 @@ org.jeecgframework.jimureport jimureport-nosql-starter - ${jimureport-spring-boot-starter.version} + 1.9.4.1 + + + org.apache.calcite + calcite-elasticsearch + + @@ -442,7 +447,6 @@ jeecg-boot-starter3-chatgpt ${jeecgboot.version} -