From 372b77c662c4b148914a3c2adb0877e8c065e793 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 13 Jan 2021 17:24:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=881.2.75?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fbd616e1..a3654b9f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 2.5 1.3.3 1.7 - 1.2.74 + 1.2.75 8.0.3 4.1.2 2.6.2 From 12d8add3e4426617ce5de2e2ddce72168d517222 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 13 Jan 2021 17:43:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-boot-admin?= =?UTF-8?q?=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=882.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a3654b9f..bb9dc354 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 2.3.4.RELEASE Hoxton.SR8 2.2.3.RELEASE - 2.3.0 + 2.3.1 2.1.3 2.9.2 1.5.24 From 3fc684b3467f6ebe33bddc5707a09d03a999798d Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 13 Jan 2021 17:45:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-cloud=E5=88=B0Hoxt?= =?UTF-8?q?on.SR9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb9dc354..040db47e 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 1.8 2.3.4.RELEASE - Hoxton.SR8 + Hoxton.SR9 2.2.3.RELEASE 2.3.1 2.1.3 From 1dec23417445942dc30639eacc1cca2021479307 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 13 Jan 2021 17:46:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-boot=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC2.3.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 040db47e..eac204ec 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ UTF-8 UTF-8 1.8 - 2.3.4.RELEASE + 2.3.7.RELEASE Hoxton.SR9 2.2.3.RELEASE 2.3.1 From be12108139e0e976eb8b54c3c9317257e2791fc6 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 13 Jan 2021 17:53:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A0=91=E8=A1=A8=E4=BB=A3=E7=A0=81=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm index ecc0fbcc..d4c5e42f 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm @@ -253,6 +253,7 @@ import ImageUpload from '@/components/ImageUpload'; #break #end #end +#foreach($column in $columns) #if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") import FileUpload from '@/components/FileUpload'; #break From 99390fda05f53af18a07a3ba5194bada39a54716 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 14 Jan 2021 13:22:53 +0800 Subject: [PATCH 6/6] update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cedefcdf..25412480 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ com.ruoyi ├── ruoyi-common // 通用模块 │ └── ruoyi-common-core // 核心模块 │ └── ruoyi-common-datascope // 权限范围 +│ └── ruoyi-common-datasource // 多数据源 │ └── ruoyi-common-log // 日志记录 │ └── ruoyi-common-redis // 缓存服务 │ └── ruoyi-common-security // 安全模块 @@ -107,7 +108,7 @@ com.ruoyi - +