Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/common/utils/JdbcToJavaUtil.java

@@ -100,6 +100,7 @@ public class JdbcToJavaUtil {
             case LONGVARCHAR:
                 return "String";
             case DATE:
+                return "LocalDate";
             case TIMESTAMP:
                 if (dateType == 0) {
                     return "LocalDateTime";

src/main/java/com/xjrsoft/module/generator/service/impl/ApiGeneratorServiceImpl.java

@@ -174,7 +174,7 @@ public class ApiGeneratorServiceImpl implements IApiGeneratorService {
                 }
                 fieldConfig.setFieldComment(column.getComment());
                 fieldConfig.setPk(column.isPk());
-                fieldConfig.setFieldType(JdbcToJavaUtil.getClassName(column.getTypeEnum(), 1));
+                fieldConfig.setFieldType(JdbcToJavaUtil.getClassName(column.getTypeEnum(), 0));
                 fieldConfig.setFieldName(StrUtil.toCamelCase(column.getName()));
 
                 fieldConfigList.add(fieldConfig);

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

@@ -22,7 +22,7 @@ public class FreeMarkerGeneratorTest {
     public void generateCodesTest() throws IOException {
         List<TableConfig> tableConfigs = new ArrayList<>();
         TableConfig mainTable = new TableConfig();
-        mainTable.setTableName("xjr_workflow_form_relation");
+        mainTable.setTableName("league_members_manage");
         mainTable.setIsMain(true);
         mainTable.setPkField(GlobalConstant.DEFAULT_PK);
         mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);