Merge branch 'develop'

# Conflicts: # pom.xml
4 years ago · 0d1f68cafb
parent 0bc923688b 335d34a080
commit 0d1f68cafb
1 changed files with 2 additions and 1 deletions
--- a/pom.xml
+++ b/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>