Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppInfoTempleteFieldServiceImpl.java

@@ -64,10 +64,10 @@ public class AppInfoTempleteFieldServiceImpl extends AbstractCRUDServiceImpl<App
                 fieldEntity.setId(null);
                 fieldSaveList.add(fieldEntity);
             }
+        }
 
-            if (!ObjectUtils.isEmpty(fieldSaveList)) {
-                appInfoFieldService.save(fieldSaveList, context);
-            }
+        if (!ObjectUtils.isEmpty(fieldSaveList)) {
+            appInfoFieldService.save(fieldSaveList, context);
         }
         super.saveAfter(entity, context);
     }

base-manager/src/main/resources/bootstrap.yml

@@ -45,4 +45,5 @@ application:
   auth:
     unloginUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/padsign/*,/terminal/*,/resource/list,/api/asset/*,/api/*,/flow/*,/uploads/*,/project/file/*,/file/*,/assessment/*
     uncheckUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/padsign/*,/terminal/*,/resource/list,/api/asset/*,/api/*,/flow/*,/uploads/*,/project/file/*,/file/*,/assessment/*
-
+dm:
+  enable: true

base-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -19,7 +19,12 @@
 		</plugin>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
 			<property name="enableExecutorTime" value="false" />
-			<property name="showSql" value="true" />
+			<property name="showSql" value="false" />
 		</plugin>
+
+<!--		<plugin interceptor="com.mortals.framework.thirty.dm.DmTransInterceptor">
+
+		</plugin>-->
+
 	</plugins>
 </configuration>
\ No newline at end of file