From 1100a665584d5e09f3940732fdbedaed87fa0a9a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 31 Jul 2020 16:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=AE=BE=E7=BD=AE=E5=AE=9E=E4=BE=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=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/static/ruoyi/js/ry-ui.js         | 2 +-
 .../main/resources/templates/system/user/profile/avatar.html    | 2 +-
 .../src/main/java/com/ruoyi/generator/util/VelocityUtils.java   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 3b99d787..0863e8e8 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -11,7 +11,7 @@ var table = {
     // 设置实例配置
     set: function(id) {
     	if($.common.getLength(table.config) > 1) {
-    		var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find(".table").attr("id") : id;
+    		var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find("table.table").attr("id") : id;
             if ($.common.isNotEmpty(tableId)) {
                 table.options = table.get(tableId);
             }
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html
index 4034ba49..a1f9e732 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html
@@ -15,7 +15,6 @@
 	
 	.cropped {
 		width: 200px;
-		height: 345px;
 		border: 1px #ddd solid;
 		box-shadow: 0px 0px 12px #ddd;
 	}
@@ -236,6 +235,7 @@ function submitHandler() {
 
 $(window).resize(function() {
     $('.imageBox').height($(window).height() - 80);
+    $('.cropped').height($(window).height() - 40);
 }).resize();
 
 if (!HTMLCanvasElement.prototype.toBlob) {
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 9f435158..79876811 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -292,7 +292,6 @@ public class VelocityUtils
     public static String getPermissionPrefix(String moduleName, String businessName)
     {
         return StringUtils.format("{}:{}", moduleName, businessName);
-
     }
 
     /**