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

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachinePartsController.java

@@ -167,6 +167,8 @@ public class AdminMachinePartsController {
         Map<String, Object> model = new HashMap<String, Object>();
         model.put("fileName", "零件列表");	// 下载文件名称
 
+        String path = "https://rst.iamberry.com";
+
         // 标题
         List<String> titles = new ArrayList<String>();
         titles.add("零件编号");
@@ -190,7 +192,7 @@ public class AdminMachinePartsController {
             row.add(info.getComponentsNo() == null ? null:info.getComponentsNo());
             row.add(info.getSupplierName() == null ? null:info.getSupplierName());
             row.add(info.getComponentsName() == null ? null:info.getComponentsName());
-            row.add(info.getComponentsImg() == null ? null:request.getServerName()+info.getComponentsImg());
+            row.add(info.getComponentsImg() == null ? null:path + info.getComponentsImg());
             row.add(info.getComponentsStatus() == 0 ? "停止使用":"正常使用");
             row.add(info.getComponentsCost()/100);
             row.add(info.getComponentsWeight());

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl

@@ -30,7 +30,7 @@
             <input class="my-input" type="text" name="deviceNumber" value="${deviceNumber!}" placeholder="请输入设备编号"/>
             <input class="my-input" type="text" name="deviceName" value="${deviceName!}" placeholder="请输入设备名称"/>
             <input class="my-input" type="text" name="deviceRemake" value="${deviceRemake!}" placeholder="请输入备注"/>
-            <select class="my-select" name="deviceStatus" style="height: 30px;width: 150px">
+            <select class="my-select" name="deviceStatus" style="height: 36px;width: 150px">
                 <option value ="">全部</option>
                 <option value ="0" <#if deviceStatus??><#if deviceStatus == 0>selected="selected"</#if></#if>>停止使用</option>
                 <option value ="1" <#if deviceStatus??><#if deviceStatus == 1>selected="selected"</#if></#if>>正常使用</option>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/employee_list.ftl

@@ -36,7 +36,7 @@
             <input type="text" class="my-input"  style="width:150px" value="${employeeNo!}" placeholder="员工编号" id="employeeNo" name="employeeNo">
             <input type="text" class="my-input"  style="width:150px" value="${employeeName!}" placeholder="员工姓名" id="employeeName" name="employeeName">
             <input type="text" class="my-input"  style="width:150px" value="${employeeTel!}" placeholder="员工电话" id="employeeTel" name="employeeTel">
-            <select class="my-select" name="employeeState" style="height: 30px;width: 150px">
+            <select class="my-select" name="employeeState" style="height: 36px;width: 150px">
                 <option value ="">全部</option>
                 <option value ="1" <#if employeeState??><#if employeeState == 1>selected="selected"</#if></#if>>在职</option>
                 <option value ="0" <#if employeeState??><#if employeeState == 0>selected="selected"</#if></#if>>离职</option>