Merge remote-tracking branch 'origin/master'

src/main/webapp/pages/admin/roadshow_mgr/index.jsp

@@ -51,7 +51,7 @@
             </select>
         </div>
         <div class="form-group">
-            <label for="roadShowState">项目阶段</label>
+            <label for="roadShowStage">项目阶段</label>
             <select id="roadShowStage" name="roadShowStage" class="form-control">
                 <option></option>
                 <c:forEach items="${dicRoadShowStage}" var="item" >

src/main/webapp/pages/admin/roadshow_mgr/list.jsp

@@ -15,7 +15,7 @@
             <th>融资额度</th>
             <th>项目阶段</th>
             <th>发布日期</th>
-            <th>状态</th>
+<%--            <th>状态</th>--%>
             <th class="hidden-print">操 作</th>
         </tr>
         </thead>
@@ -30,7 +30,7 @@
                         <td>${item.financingAmount}</td>
                         <td>${item.projectPhase}</td>
                         <td><fmt:formatDate value="${item.publishAt}"  type="Date" pattern="yyyy-MM-dd"/></td>
-                        <td>${item.roadshowState=="未审核"?"审核中":item.auditResult}</td>
+                        <td>${item.roadshowState}</td>
                         <td class="btn-table hidden-print">
                             <input type="hidden" name="id" value="${item.id}" />
                             <c:if test="${item.auditResult != '审核通过'}">