Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -853,7 +853,7 @@ public class AdminCustomerController {
 //                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。客诉编号为："+ customerId, 505);
 //            }
         }
-        return new ResponseJson(200, "录入客诉成功！客诉编号：" + customerId + ",请前往Efast进行换货/退货操作。", 200);
+        return new ResponseJson(200, "录入客诉成功！客诉编号：" + customerId + "，请前往Efast进行换货/退货操作。", 200);
     }
 
     /**

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -50,11 +50,10 @@
         .color-div{height: 30px;}
 
         .table-td-color{}
-        .msg-phone{
-            height: 35px;
-            line-height: 35px;
-        }
+        .msg-phone{height: 35px;line-height: 35px;}
 
+        /*用于邮寄信息的css*/
+        .youxi_xinxi{width: 980px}
     </style>
     <title>添加客诉 - 客诉管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -50,10 +50,10 @@
         .color-div{height: 30px;}
 
         .table-td-color{}
-        .msg-phone{
-            height: 35px;
-            line-height: 35px;
-        }
+        .msg-phone{height: 35px;line-height: 35px; }
+
+        /*用于邮寄信息的css*/
+        .youxi_xinxi{width: 980px}
     </style>
     <title>修改客诉 - 客诉管理 - RST</title>
 </head>