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/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -699,7 +699,7 @@ public class AdminOrderController {
 
         // 设置返回内容
         response.setContentType("application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment;filename="+new String(("Efast订单号").getBytes("UTF-8"), "ISO-8859-1") + ".txt");
+        response.setHeader("Content-Disposition", "attachment;filename="+new String(("Efast_transaction_number").getBytes("UTF-8"), "ISO-8859-1") + ".txt");
         response.setContentLength((int) file.length());
 
         byte[] buffer = new byte[4096];// 缓冲区

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/add_detect.ftl

@@ -145,7 +145,7 @@
             <label class="form-label col-3 col-sm-3 huanhang"  style="text-align: right;">备注：</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="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
+                    <textarea rows="3" style="width: 186%;margin-left: -15%;margin-top: 5%;" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
                 </div>
             </div>
         </div>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_complete.ftl

@@ -126,7 +126,7 @@
                 <label class="form-label col-3 col-sm-3 huanhang"  style="text-align: right;">备注：</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="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
+                        <textarea rows="3" style="width: 193%;margin-left: -15%;margin-top: 5%;" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
                     </div>
                 </div>
             </div>

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

@@ -23,6 +23,7 @@
         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 +34,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: -36%; padding-left: 0px;">
                 <table class="table table-border table-bg table-bordered" style="width: 420px;">
                     <thead>
                     <tr class="text-c">
@@ -77,7 +78,7 @@
         </div>
         <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修日期：</label>
-            <div class="formControls col-7 col-sm-7 text-c huanhang" style="margin-left: -4.5%;">
+            <div class="formControls col-7 col-sm-7 text-c huanhang" style="margin-left: -5%;">
                 <input class="my-input-date" type="text"  name="maintenanceContent_Date" id="maintenanceContentDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择维修日期" readonly="readonly"/>
             </div>
         </div>
@@ -129,7 +130,7 @@
 
         <div class="input-box">
             <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="formControls col-xs-9 col-sm-9" style="padding-left: 3px;">
                 <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="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
                 </div>