From 6861ba125e0559136f0c2694431c0dbf52729ae6 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 8 May 2022 16:19:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/service/support/EmpUserServiceSupport.java    | 2 +-
 .../core/src/main/resources/views/modules/sys/sysDesktop.html | 4 +++-
 parent/pom.xml                                                | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
index 25cd14ca..2dab87bd 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
@@ -56,7 +56,7 @@ public class EmpUserServiceSupport extends CrudService<EmpUserDao, EmpUser>
 	@PostConstruct
 	private void corpModelValid() throws Exception{
 		if (Global.isUseCorpModel() != Global.getPropertyToBoolean("user.useCorpModel", "false")){
-			throw new Exception("\n\nuser.useCorpModel=true? 你开启了多租户模式，视乎你的当前版本不是JeeSite专业版。\n");
+			throw new Exception("\n\nuser.useCorpModel=true? 你开启了多租户模式，似乎你的当前版本不是JeeSite专业版。\n");
 		}
 	}
 	
diff --git a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html
index bff49df5..4b3e21e9 100644
--- a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html
+++ b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html
@@ -110,7 +110,9 @@
 										            type : 'value'
 										        }
 										    ],
-										    //color: ['#FAD860','#F3A43B','#60C0DD','#C6E579'],
+                                            color: [
+                                                '#5470c6','#ee6666','#73c0de','#3ba272','#9a60b4'
+                                            ],
 										    series : [
 										        {
 										            name:'成交',
diff --git a/parent/pom.xml b/parent/pom.xml
index 577fd189..ca682f0b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -161,6 +161,7 @@
 						</warSourceExcludes>
 						<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>
 						<warName>${project.artifactId}</warName>
+						<failOnMissingWebXml>false</failOnMissingWebXml>
 						<archive>
 							<addMavenDescriptor>false</addMavenDescriptor>
 						</archive>