Merge branch 'master' of D:\Dev\Projects\Java\udiwms-java with conflicts.

.gitignore

@@ -1,6 +1,8 @@
 /target/
 !.mvn/wrapper/maven-wrapper.jar
 
+*.class
+
 ### STS ###
 .apt_generated
 .classpath
@@ -22,4 +24,6 @@
 /nbbuild/
 /dist/
 /nbdist/
-/.nb-gradle/
+/.nb-gradle/
+/api-admin/target/
+/api-common/target/

api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java

@@ -13,6 +13,9 @@ public class BasicThirdSysEntity {
     private String thridUrl;
     private Boolean mainSys;
 
+    //第三方系统IP地址
+    private String thirdSysUrl;
+
     //第三方系统授权码
     private String apikey;
 

api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml

@@ -13,6 +13,7 @@
             <if test="thridUrl != null">thridUrl=#{thridUrl},</if>
             <if test="enabled != null">enabled=#{enabled},</if>
             <if test="mainSys != null">mainSys=#{mainSys},</if>
+            <if test="thirdSysUrl != null">thirdSysUrl=#{thirdSysUrl},</if>
             <if test="apikey != null">apikey=#{apikey},</if>
             <if test="secretkey != null">secretkey=#{secretkey}</if>
         </trim>