From 4f8456071038cb880aad4ebc4e933a1614413073 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 8 Mar 2019 16:31:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8=E5=80=BC?=
 =?UTF-8?q?=E4=B8=BA0/1=E6=97=B6=E6=97=A0=E6=B3=95=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=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 +-
 ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm | 2 +-
 2 files changed, 2 insertions(+), 2 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 2c38c31c8..8a852611d 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
@@ -259,7 +259,7 @@
             selectDictLabel: function(datas, value) {
             	var actions = [];
                 $.each(datas, function(index, dict) {
-                    if (dict.dictValue == value) {
+                    if (dict.dictValue == ('' + value)) {
                     	actions.push("<span class='badge badge-" + dict.listClass + "'>" + dict.dictLabel + "</span>");
                         return false;
                     }
diff --git a/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm
index 540c5ab39..c0df374b1 100644
--- a/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service;
 import ${package}.mapper.${className}Mapper;
 import ${package}.domain.${className};
 import ${package}.service.I${className}Service;
-import com.ruoyi.common.support.Convert;
+import com.ruoyi.common.core.text.Convert;
 
 /**
  * ${tableComment} 服务层实现