Merge branch 'develop'

# Conflicts:
#	pom.xml

pom.xml

@@ -9,10 +9,11 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.79-SNAPSHOT</version>
+    <version>2.3.79</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
+        <yixsoft-batis.version>1.0.12</yixsoft-batis.version>
     </properties>
 
     <dependencies>