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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/update_maintenance.ftl

@@ -23,6 +23,8 @@
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .huanhang{ float:left}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
+
     </style>
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
@@ -33,7 +35,7 @@
         <div class="input-box">
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">维修产品：</label>
             <div class="col-9 col-sm-9 text-c">
-                <div class="radio-box"  style="margin-right: -40%;">
+                <div class="radio-box"  style="margin-right: -37%;padding-left: 0px;">
                     <table class="table table-border table-bg table-bordered" style="width: 420px;">
                         <thead>
                         <tr class="text-c">
@@ -131,7 +133,7 @@
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">备注：</label>
             <div class="formControls col-xs-9 col-sm-9">
                 <div class="radio-box">
-                    <textarea rows="3" style="width: 200%;margin-left: -15%;margin-top: 5%;" cols="20" name="maintenanceDesc" id="maintenanceDesc" class="my-textarea" placeholder="请详细备注维修的内容！">${maintenanceInfo.maintenanceDesc!''}</textarea>
+                    <textarea rows="3" style="width: 221%;margin-left: -20%;margin-top: 5%;" cols="20" name="maintenanceDesc" id="maintenanceDesc" class="my-textarea" placeholder="请详细备注维修的内容！">${maintenanceInfo.maintenanceDesc!''}</textarea>
                 </div>
             </div>
         </div>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -70,7 +70,7 @@
                 <th width="200">签收产品</th>
                 <th width="130">退货地区</th>
                 <th width="100">是否少配件</th>
-                <th width="150">售后原因</th>
+                <th width="90">售后原因</th>
                 <th width="150">客服备注</th>
                 <th width="150">返厂日期</th>
                 <th width="100">处理状态</th>