From b22fc6d45ee16d3e7099632a80fd9caabeba4895 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sat, 17 Nov 2018 22:52:27 +0800 Subject: [PATCH] v4.1.1 --- .../jeesite/modules/sys/db/InitCoreData.xlsx | Bin 167553 -> 167547 bytes .../main/resources/db/upgrade/core/versions | 3 ++- .../java/com/jeesite/test/InitCoreData.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index aaa654a9b66df51afe60310e44a19e29354f27c8..6fd99678d0fbf2e97c0ec70b20263568f59d889f 100644 GIT binary patch delta 10020 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 G!v6tfN!$nk delta 9983 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

Uw?uFgP62{Yl3^%C+2*A@rmYUn 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 diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions index bcafa4ae..7685c8f8 100644 --- a/modules/core/src/main/resources/db/upgrade/core/versions +++ b/modules/core/src/main/resources/db/upgrade/core/versions @@ -6,4 +6,5 @@ 4.0.5 4.0.6 4.0.7 -4.1.0 \ No newline at end of file +4.1.0 +4.1.1 \ No newline at end of file diff --git a/web/src/test/java/com/jeesite/test/InitCoreData.java b/web/src/test/java/com/jeesite/test/InitCoreData.java index 609c8ba0..7ba60a38 100644 --- a/web/src/test/java/com/jeesite/test/InitCoreData.java +++ b/web/src/test/java/com/jeesite/test/InitCoreData.java @@ -24,7 +24,7 @@ public class InitCoreData extends com.jeesite.modules.sys.db.InitCoreData { public void initCoreData() throws Exception{ createTable(); initLog(); - initArea("3700","3701","3702"); + initArea();//("3700","3701","3702"); initConfig(); initModule(); initDict();