Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/webpage/modules/sg/project/lookItemForm.jsp
#	src/main/webapp/webpage/modules/sg/project/updateItemForm.jsp
#	src/main/webapp/webpage/modules/sg/projecttem/lookItem.jsp
#	src/main/webapp/webpage/modules/sg/projecttem/updateItem.jsp

src/main/webapp/webpage/modules/sg/project/addItemForm.jsp

@@ -52,7 +52,7 @@
             <tr>
                 <td>施工单位</td>
                 <td>
-                    <input type="text" name="units" autocomplete="off" class="layui-input">
+                    <input type="text" name="unit" autocomplete="off" class="layui-input">
                 </td>
             </tr>
             </tbody>

src/main/webapp/webpage/modules/sg/project/management.js

@@ -95,7 +95,7 @@ layui.config({
                 "id": "${items.id}",
                 "type":"${items.type}",
                 "gcmc":"${items.itemName}",
-                "xmsl": "某施工单位一",
+                "xmsl": "${items.unit}",
                 "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if><c:if test="${items.type eq '3'}">变电站线路</c:if>",
                 "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
                 "status":"3",

src/main/webapp/webpage/modules/sg/projecttem/addItem.jsp

@@ -48,7 +48,7 @@
             <tr>
                 <td>施工单位</td>
                 <td>
-                    <input type="text" name="units" autocomplete="off" class="layui-input">
+                    <input type="text" name="unit" autocomplete="off" class="layui-input">
                 </td>
             </tr>
             </tbody>

src/main/webapp/webpage/modules/sg/projecttem/manageList.js

@@ -72,7 +72,7 @@
     "id": "${items.id}",
     "type":"${items.type}",
     "gcmc":"${items.itemName}",
-    "xmsl": "某施工单位一",
+    "xmsl": "${items.unit}",
     "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if><c:if test="${items.type eq '3'}">变电站线路</c:if>",
     "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
     "status":"3",