Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

# Conflicts:
#	pom.xml

pom.xml

@@ -178,6 +178,11 @@
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+		    <groupId>net.sf.json-lib</groupId>
+		    <artifactId>json-lib</artifactId>
+		    <version>2.4</version>
+		</dependency>
 	</dependencies>
 
 	<build>