Merge remote-tracking branch 'origin/master'

src/main/webapp/pages/admin/access_statistics/resourceCount.jsp

@@ -58,7 +58,7 @@
 </form>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
-<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>
+<%--<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>--%>
 <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>
 <div id="divGrid">
 </div>

src/main/webapp/pages/admin/themeStatistics/deptCount.jsp

@@ -50,7 +50,7 @@
 </form>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
-<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>
+<%--<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>--%>
 <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>
 <div id="divGrid">
 </div>

src/main/webapp/pages/admin/themeStatistics/resourceCount.jsp

@@ -50,7 +50,7 @@
 </form>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
-<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>
+<%--<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>--%>
 <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>
 <div id="divGrid">
 </div>

src/main/webapp/pages/admin/themeStatistics/themeCount.jsp

@@ -51,7 +51,7 @@
 </form>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
-<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>
+<%--<button id="btnAdd" type="button" class="btn btn-sm btn-primary btn-position"><i class="fa fa-plus"></i>新增</button>--%>
 <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>
 <div id="divGrid">
 </div>