Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/module/form/utils/FormDataTransUtil.java

@@ -150,6 +150,7 @@ public final class FormDataTransUtil {
                     deptMap = departmentList.stream().collect(Collectors.toMap(department -> department.getId().toString(), Department::getName, (e1, e2) -> e1));
                 }
                 fieldValuesMap.put(bindField, deptMap);
+                multiFieldMap.put(bindField, null);
             } else if (StrUtil.equalsIgnoreCase(ComponentTypeConstant.USER, type)
                     || (StrUtil.equalsIgnoreCase(ComponentTypeConstant.INFO, type) && infoType.equals(0))) {
                 if (userMap == null) {

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -81,7 +81,7 @@ public class FreeMarkerGeneratorTest {
         params.setPage(true);
         params.setImport(true);
         params.setExport(true);
-        params.setOutMainDir(true);
+        params.setOutMainDir(false);
         params.setDs(ds);
 
 
@@ -353,4 +353,5 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
 }