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

applications/document/document-server/src/test/java/com/usoftchina/saas/document/service/CustomerServiceTest.java

@@ -44,7 +44,7 @@ public class CustomerServiceTest {
         CustomercontactDTO item = new CustomercontactDTO();
         item.setCc_name("联系人1");
         item.setCc_detno(1);
-        item.setCc_tel(112L);
+        item.setCc_tel("");
         item.setCc_qq("396996717");
         item.setCc_email("@qq.com");
 

frontend/saas-web/app/view/sys/messagelog/DataList.js

@@ -9,9 +9,9 @@ Ext.define('saas.view.sys.messagelog.DataList', {
 
     tbar: [{
         width: 150,
-        name: 'ml_caller',
+        name: 'ml_name',
         xtype: 'textfield',
-        emptyText : '单据Caller'
+        emptyText : '单据类别'
     },{
         width: 150,
         name: 'ml_code',
@@ -52,9 +52,9 @@ Ext.define('saas.view.sys.messagelog.DataList', {
         dataIndex : "id", 
         xtype : "numbercolumn",   
     },{
-        text:'单据Caller',
-        dataIndex : "ml_caller",
-        width : 200.0, 
+        text:'单据类别',
+        dataIndex : "ml_name",
+        width : 120.0, 
     },{
         text : "单据编号", 
         width : 200.0, 
@@ -65,6 +65,13 @@ Ext.define('saas.view.sys.messagelog.DataList', {
         dataIndex : "ml_content", 
         width : 220.0, 
     }, 
+    {
+        xtype:'datecolumn',
+        format:'Y-m-d H:i:s',
+        text : "操作时间", 
+        dataIndex : "createTime", 
+        width : 200.0, 
+    },
     {
         text : "结果", 
         dataIndex : "ml_result",