Merge remote-tracking branch 'origin/master'

mybusiness/src/main/resources/templates/business/manager/firemanager/historyFire.html

@@ -14,10 +14,10 @@
                         <ul>
                             <li class="select-time">
                                 <label>上报时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" required
                                        name="params[beginReportTime]"/>
                                 <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" required
                                        name="params[endReportTime]"/>
                             </li>
                             <li>