feats

.gitignore

@@ -1,2 +1,3 @@
 db/
+db/db.mv.db
 application.yml

application.yml

@@ -1,9 +1,9 @@
 spring:
   resources:
-    static-locations: file:///E:/work/jungongzhang/jgz/resources/static/
+    static-locations: file:///E:/work/newJgzWeb/resources/static/
   datasource:
     driver-class-name: org.h2.Driver
-    url: jdbc:h2:E:/work/jungongzhang/jgz/db/db
+    url: jdbc:h2:E:/work/newJgzWeb/db/db
     username: 
     password: 
     hikari:
@@ -13,7 +13,7 @@ spring:
       minimum-idle: 2
       connection-timeout: 30000
   thymeleaf:
-    prefix: file:///E:/work/jungongzhang/jgz/resources/templates/
+    prefix: file:///E:/work/newJgzWeb/resources/templates/
     cache: false
   jpa:
     generate-ddl: false

resources/static/less/ext-page.less

@@ -274,4 +274,3 @@
     }
   }
 }
->>>>>>> 268768cf2fee2e747ce9459fa2ded365d1c962d0

resources/templates/common/common_list.html

@@ -9,7 +9,6 @@
 				<h2 class="page-title">[[${title}]]</h2>
 			</div>
 		</div>
-<<<<<<< HEAD
 		<div class="panel" style="position: relative; z-index: 20;">
 			<div class="panel-body search-bar">
 				<!--<span id="schSpan"
@@ -32,44 +31,6 @@
 					<input type="hidden" id="searchCols" />
 					<span class="input-group-btn"><a class="input-group-btn btn btn-primary" onclick="queryDatas()"
 							id="ordinary">搜索</a></span>
-=======
-	</div>
-	<div class="panel" style="position: relative; z-index: 20;">
-		<div class="panel-body search-bar">
-			<!--<span id="schSpan"
-				class="input-group"> <span class="input-group-addon">
-					<span class="pull-right" id="schCol_span"> 
-								</span> </span> <input type="text" name="schVal" id="schVal" value=""
-				class="form-control  "><input type="hidden" id="searchCols" />
-				<span class="input-group-btn"> <a class="btn btn-primary"
-					onclick="queryDatas()" id="ordinary"><i class="icon icon-search"></i>搜索</a>
-			</span>
-			</span>-->
-			<span id="schSpan" class="input-group">
-				<span class="input-group-addon" id="selSapn" style="display:none"></span>
-				<select data-placeholder="请选择查询项..." class="chosen-select form-control" tabindex="2" multiple="" id="schSel"
-					style="display:none">
-
-				</select>
-				<span class="input-group-addon" id="schCol_span"></span>
-				<input type="text" name="schVal" id="schVal" value="" class="form-control ">
-				<input type="hidden" id="searchCols" />
-				<span class="input-group-btn"><a class="input-group-btn btn btn-primary" onclick="queryDatas()"
-						id="ordinary">搜索</a></span>
-			</span>
-		</div>
-	</div>
-	<div class="panel">
-		<div class="panel-body">
-			<div class="editBar" id="schBar">
-				<span class="btn-group" id="btnSpan">
-					<!-- th:if="${haveAuth != null && haveAuth == '1'}" -->
-					<a class="btn btn-primary" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
-					<a class="btn btn-info" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
-					<a class="btn btn-danger" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a>
-<<<<<<< HEAD
->>>>>>> 65812a86a026ec058d29ed8cafd8100ff63f9bbe
-=======
 				</span>
 
 			</div>