diff --git a/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue b/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue
index d06aa9e5..004fd44d 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue
@@ -15,7 +15,7 @@
       @change="handleChange"
       @preview="handlePreview"
       :class="!isMultiple?'imgupload':''">
-      <div style="width:104px;height:104px">
+      <div :style="{'width':(!isMultiple?'104px':'auto'),'height':(!isMultiple?'104px':'auto')}">
         <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="width:100%;height:100%"/>
         <div v-else class="iconp">
           <a-icon :type="uploadLoading ? 'loading' : 'plus'" />
diff --git a/ant-design-vue-jeecg/src/views/examples/list/TableInnerEditList.vue b/ant-design-vue-jeecg/src/views/examples/list/TableInnerEditList.vue
index 3029cf58..db7d9d40 100644
--- a/ant-design-vue-jeecg/src/views/examples/list/TableInnerEditList.vue
+++ b/ant-design-vue-jeecg/src/views/examples/list/TableInnerEditList.vue
@@ -62,7 +62,7 @@
     </div>
 
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="() => $router.push({name: 'anime-add'})">新建</a-button>
+      <a-button type="primary" icon="plus" @click="() => this.handleModalVisible(true)">新建</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1"><a-icon type="delete" />删除</a-menu-item>
@@ -111,7 +111,14 @@
         </div>
       </template>
     </s-table>
-
+    <a-modal title="新建规则" destroyOnClose :visible="visibleCreateModal" @ok="handleCreateModalOk" @cancel="handleCreateModalCancel">
+      <!---->
+      <a-form style="margin-top: 8px" :autoFormCreate="(form)=>{this.createForm = form}">
+        <a-form-item :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" label="描述" fieldDecoratorId="description" :fieldDecoratorOptions="{rules: [{ required: true, message: '请输入至少五个字符的规则描述！', min: 5 }]}">
+          <a-input placeholder="请输入" />
+        </a-form-item>
+      </a-form>
+    </a-modal>
   </a-card>
 </template>
 
@@ -181,7 +188,8 @@
         },
 
         selectedRowKeys: [],
-        selectedRows: []
+        selectedRows: [],
+        visibleCreateModal:false
       }
     },
     methods: {
@@ -230,6 +238,16 @@
       toggleAdvanced () {
         this.advanced = !this.advanced
       },
+      //添加逻辑
+      handleModalVisible(isVisible) {
+        this.visibleCreateModal = isVisible;
+      },
+      handleCreateModalCancel() {
+        this.visibleCreateModal = false;
+      },
+      handleCreateModalOk() {
+        this.visibleCreateModal = false;
+      },
     },
     watch: {
       /*
diff --git a/ant-design-vue-jeecg/src/views/jeecg/InterfaceTest.vue b/ant-design-vue-jeecg/src/views/jeecg/InterfaceTest.vue
index 117f7dca..8b30f73f 100644
--- a/ant-design-vue-jeecg/src/views/jeecg/InterfaceTest.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/InterfaceTest.vue
@@ -1,10 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <a-row>
+    <a-row style="margin-top: 20px">
       <a-col :md="2" :sm="4">
         <a-select defaultValue="POST" style="width: 90px" @change="handleChange" size="large">
           <a-select-option value="POST">POST</a-select-option>
-          <!--<a-select-option value="GET">GET</a-select-option>-->
+          <a-select-option value="GET">GET</a-select-option>
+          <a-select-option value="PUT">PUT</a-select-option>
+          <a-select-option value="DELETE">DELETE</a-select-option>
         </a-select>
       </a-col>
       <a-col :md="22" :sm="20">
@@ -19,7 +21,7 @@
 
     <a-tabs defaultActiveKey="2">
       <a-tab-pane tab="params" key="2">
-        <textarea style="width:100%;font-size: 16px;font-weight:500" :rows="13" @input="changeVal">
+        <textarea style="width:100%;font-size: 16px;font-weight:500" :rows="13" @blur="changeVal">
         </textarea>
       </a-tab-pane>
     </a-tabs>
@@ -33,7 +35,7 @@
   </a-card>
 </template>
 <script>
-  import { postAction,getAction } from '@/api/manage'
+  import { axios } from '@/utils/request'
   import { ACCESS_TOKEN } from "@/store/mutation-types"
   import Vue from 'vue'
   export default {
@@ -49,28 +51,25 @@
     methods: {
       onSearch (value) {
         let that = this
+        if(!value){
+          that.$message.error("请填写路径")
+          return false
+        }
         this.resultJson = {};
-        if("POST"===this.requestMethod.toUpperCase()){
-          postAction(value,this.paramJson).then((res)=>{
+          axios({
+            url: value,
+            method: this.requestMethod,
+            data: this.paramJson
+          }).then((res) => {
             console.log(res)
             this.resultJson = res
           }).catch((err) => {
             that.$message.error("请求异常："+err)
           })
-        }else {
-          getAction(value,this.paramJson).then((res)=>{
-            console.log(res)
-            this.resultJson = res;
-          }).catch((err) => {
-            that.$message.error("请求异常："+err)
-          })
-        }
       },
       changeVal(e){
         try {
           let json = e.target.value;
-          json = json.replace(/\n/g,"");
-          json = json.replace(/\s*/g,"");
           if(json.indexOf(",}")>0){
             json = json.replace(",}","}");
           }
diff --git a/ant-design-vue-jeecg/src/views/jeecg/JeecgDemoList.vue b/ant-design-vue-jeecg/src/views/jeecg/JeecgDemoList.vue
index 13f49c79..b4efe4f0 100644
--- a/ant-design-vue-jeecg/src/views/jeecg/JeecgDemoList.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/JeecgDemoList.vue
@@ -89,10 +89,10 @@
           <a-popover title="自定义列" trigger="click" placement="leftBottom">
             <template slot="content">
               <a-checkbox-group @change="onColSettingsChange" v-model="settingColumns" :defaultValue="settingColumns">
-                <a-row>
+                <a-row style="width: 400px">
                   <template v-for="(item,index) in defColumns">
                     <template v-if="item.key!='rowIndex'&& item.dataIndex!='action'">
-                        <a-col :span="12"><a-checkbox :value="item.dataIndex">{{ item.title }}</a-checkbox></a-col>
+                        <a-col :span="12"><a-checkbox :value="item.dataIndex"><j-ellipsis :value="item.title" :length="10"></j-ellipsis></a-checkbox></a-col>
                     </template>
                   </template>
                 </a-row>
@@ -118,10 +118,10 @@
         <div slot="filterDropdown">
           <a-card>
             <a-checkbox-group @change="onColSettingsChange" v-model="settingColumns" :defaultValue="settingColumns">
-              <a-row>
+              <a-row style="width: 400px">
                 <template v-for="(item,index) in defColumns">
                   <template v-if="item.key!='rowIndex'&& item.dataIndex!='action'">
-                    <a-col :span="12"><a-checkbox :value="item.dataIndex">{{ item.title }}</a-checkbox></a-col>
+                    <a-col :span="12"><a-checkbox :value="item.dataIndex"><j-ellipsis :value="item.title" :length="10"></j-ellipsis></a-checkbox></a-col>
                   </template>
                 </template>
               </a-row>
diff --git a/ant-design-vue-jeecg/src/views/system/DictItemList.vue b/ant-design-vue-jeecg/src/views/system/DictItemList.vue
index dd2f6bca..6251437b 100644
--- a/ant-design-vue-jeecg/src/views/system/DictItemList.vue
+++ b/ant-design-vue-jeecg/src/views/system/DictItemList.vue
@@ -58,6 +58,7 @@
             :pagination="ipagination"
             :loading="loading"
             @change="handleTableChange"
+            :rowClassName="getRowClassname"
           >
 
           <span slot="action" slot-scope="text, record">
@@ -200,8 +201,22 @@
           this.screenWidth = 600;
         }
       },
+      //update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
+      //增加样式方法返回值
+      getRowClassname(record){
+        if(record.status==0){
+          return "data-rule-invalid"
+        }
+      }
+      //update--end--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
     }
   }
 </script>
-<style scoped>
+<style lang="less" scoped>
+//update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
+/deep/ .data-rule-invalid{
+  background: #f4f4f4;
+  color: #bababa;
+}
+//update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
 </style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/NewPermissionList.vue b/ant-design-vue-jeecg/src/views/system/NewPermissionList.vue
index ef6d49cb..55c1e1a1 100644
--- a/ant-design-vue-jeecg/src/views/system/NewPermissionList.vue
+++ b/ant-design-vue-jeecg/src/views/system/NewPermissionList.vue
@@ -53,7 +53,7 @@
               </a-menu-item>
 
               <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" placement="topLeft">
                   <a>删除</a>
                 </a-popconfirm>
               </a-menu-item>
diff --git a/ant-design-vue-jeecg/src/views/user/LoginSelectTenant.vue b/ant-design-vue-jeecg/src/views/user/LoginSelectTenant.vue
index c91ffc3d..fd4b46d1 100644
--- a/ant-design-vue-jeecg/src/views/user/LoginSelectTenant.vue
+++ b/ant-design-vue-jeecg/src/views/user/LoginSelectTenant.vue
@@ -16,7 +16,7 @@
           <template slot="title">
             <span>您有多个租户，请选择登录租户</span>
           </template>
-          <a-avatar style="backgroundColor:#87d068" icon="gold" />
+        <a-avatar style="backgroundColor:#87d068" icon="gold" />
         </a-tooltip>
 
         <a-select @change="handleTenantChange" :class="{'valid-error':validate_status1=='error'}" placeholder="请选择登录租户" style="margin-left:10px;width: 80%">
@@ -183,8 +183,8 @@
           return false
         }
         this.departResolve().then(()=>{
+          this.$store.dispatch('saveTenant', this.tenant_id);
           if(this.isMultiTenant){
-            this.$store.dispatch('saveTenant', this.tenant_id);
             this.$emit('success')
           }else{
             this.$emit('success')
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index a5499641..d0e81dc6 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -889,8 +889,12 @@ public class SysUserController {
                 return result;
             }
         }
-
-		if (!smscode.equals(code)) {
+        if(null == code){
+            result.setMessage("手机验证码失效，请重新获取");
+            result.setSuccess(false);
+            return result;
+        }
+		if (!smscode.equals(code.toString())) {
 			result.setMessage("手机验证码错误");
 			result.setSuccess(false);
 			return result;
@@ -1039,7 +1043,7 @@ public class SysUserController {
 			if (oConvertUtils.isEmpty(token)) {
 				 username = JwtUtil.getUserNameByToken(request);
 			} else {
-				 username = JwtUtil.getUsername(token);				
+				 username = JwtUtil.getUsername(token);
 			}
 
 			log.info(" ------ 通过令牌获取部分用户信息，当前用户： " + username);