Merge branch 'activity_xlh' of E:\intermarketing with conflicts.

ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/intermarketing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password:
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 80
+  port: 8088
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-admin/src/main/resources/templates/demo/form/basic.html

@@ -203,7 +203,7 @@
                             <a class="close-link">
                                 <i class="fa fa-times"></i>
                             </a>
-                        </div>
+                        </div>复选框&
                     </div>
                     <div class="ibox-content">
                         <form method="get" class="form-horizontal">

ruoyi-admin/src/main/resources/templates/demo/form/wizard.html

@@ -300,7 +300,7 @@ $('#smartwizard').smartWizard({
 			}
 			return true;
 		});
-		
+
 		$("#theme-selector").on("change", function() {
 			// Change theme
 			var options = {

ruoyi-admin/src/main/resources/templates/login.html

@@ -15,6 +15,7 @@
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
+
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};