Merge remote-tracking branch 'origin/dev' into dev

base-servers/mail/mail-dto/src/main/java/com/usoftchina/saas/mail/dto/TemplateMailMessage.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.mail.dto;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Map;
 
 /**

frontend/saas-web/app/view/home/InfoCard.scss

@@ -40,6 +40,10 @@ $max-card-width: 235px;
             }
         }
     }
+
+    .x-toolbar-default-vertical {
+        padding: 0;
+    }
 }
 
 .x-scroller-button {
@@ -61,11 +65,13 @@ $max-card-width: 235px;
 .x-scroller-button-left {
     left: 0;
     background-image: url('images/default/arrows-left.png') !important;
+    background-position-x: 10px !important;
 }
 
 .x-scroller-button-right {
     right: 0;
     background-image: url('images/default/arrows-right.png') !important;
+    background-position-x: 4px !important;
 }
 
 .x-btn-over.x-btn-default-small.x-scroller-button-left,

frontend/saas-web/app/view/main/Main.js

@@ -29,6 +29,7 @@ Ext.define('saas.view.main.Main', {
                 {
                     xtype: 'component',
                     reference: 'mainLogo',
+                    width: 180,
                     cls: 'main-logo-wrap',
                     html: '<div class="main-logo"><img src="resources/images/default/logo-default.png"/><div class="logo-text">优企云服</div></div>',
                     bind: {

frontend/saas-web/app/view/main/Navigation.js

@@ -5,6 +5,8 @@ Ext.define('saas.view.main.Navigation', {
 
     reference: 'navigationTreeList',
 
+    width: 180,
+
     navCollapsed: false,
     cls: 'x-navpanel',
 

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -118,6 +118,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: '资金账户',
             dataIndex: 'pd_bankname',
+            allowBlank : false,
             editor:{
                 xtype:'dbfindtrigger'
             }

frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -123,6 +123,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: '资金账户',
             dataIndex: 'rd_bankname',
+            allowBlank : false,
             width: 200,
             editor:{
                 xtype:'dbfindtrigger'