From 6424afd97bee3077936ca5340dc90b2404f707eb Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 21 Apr 2019 12:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application.yml       |  4 ++--
 .../columns/bootstrap-table-fixed-columns.js         | 12 ++++++------
 .../ajax/libs/validate/jquery.validate.extend.js     |  2 +-
 .../src/main/resources/vm/java/domain.java.vm        |  6 ++++++
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index bb4af0cd..034da3fb 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -13,10 +13,10 @@ ruoyi:
 
 # 开发环境配置
 server:
-  # 服务端口
+  # 服务器的HTTP端口，默认为80
   port: 80
   servlet:
-    # 项目contextPath
+    # 应用的访问路径
     context-path: /
   tomcat:
     # tomcat的URI编码
diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js
index 5704bfba..a6a78c6f 100644
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js
@@ -60,9 +60,9 @@
         }
         this.initFixedColumns();
 
-        var $ltr = this.$header.find('tr:eq(0)').clone(),
+        var $ltr = this.$header.find('tr:eq(0)').clone(true),
             $rtr = this.$header.find('tr:eq(0)').clone(),
-            $lths = $ltr.clone().find('th'),
+            $lths = $ltr.clone(true).find('th'),
             $rths = $rtr.clone().find('th');
 
         $ltr.html('');
@@ -78,7 +78,7 @@
         //左边列冻结
         if (this.options.fixedColumns) {
             for (var i = 0; i < this.options.fixedNumber; i++) {
-                $ltr.append($lths.eq(i).clone());
+                $ltr.append($lths.eq(i).clone(true));
             }
             this.$fixedHeaderColumns.html('').append($ltr);
         }
@@ -95,12 +95,12 @@
         if (this.options.fixedColumns) {
             this.$fixedBodyColumns.html('');
             this.$body.find('> tr[data-index]').each(function () {
-                var $tr = $(this).clone(),
-                    $tds = $tr.clone().find('td');
+                var $tr = $(this).clone(true),
+                    $tds = $tr.clone(true).find('td');
 
                 $tr.html('');
                 for (var i = 0; i < that.options.fixedNumber; i++) {
-                    $tr.append($tds.eq(i).clone());
+                    $tr.append($tds.eq(i).clone(true));
                 }
                 that.$fixedBodyColumns.append($tr);
             });
diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js b/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js
index 1e4fa273..36e05127 100644
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js
@@ -8,7 +8,7 @@ $(document).ready(function(){
 	//手机号码验证身份证正则合并：(^\d{15}$)|(^\d{17}([0-9]|X)$)
 	jQuery.validator.addMethod("isPhone",function(value,element){
 		var length = value.length;
-		var phone=/^1[3|4|5|6|7|8][0-9]\d{8}$/;
+		var phone=/^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
 		return this.optional(element)||(length == 11 && phone.test(value));
 	},"请填写正确的11位手机号");
 	//电话号码验证
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index bc0ef153..467a2e26 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -9,6 +9,12 @@ import java.util.Date;
 #break
 #end
 #end
+#foreach ($column in $columns)
+#if($column.attrType == 'BigDecimal')
+import java.math.BigDecimal;
+#break
+#end
+#end
 
 /**
  * ${tableComment}表 ${tableName}