getrebuild/rebuild
1
1
Fork 0
mirror of https://github.com/getrebuild/rebuild.git synced 2025-03-13 15:44:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
RB 2022-03-29 11:17:02 +08:00
commit de12fae389
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/rebuild/core/metadata/impl/DynamicMetadataFactory.java
View file

@ -130,6 +130,7 @@ public class DynamicMetadataFactory extends ConfigurationMetadataFactory {
.addAttribute("repeatable", String.valueOf(c[15]))
.addAttribute("queryable", String.valueOf(c[16]));
// if ("TIME".equals(c[4])) c[4] = "TEXT";
DisplayType dt = DisplayType.valueOf((String) c[4]);
field.addAttribute("type", dt.getFieldType().getName());

2
src/main/java/com/rebuild/core/service/dataimport/RecordCheckout.java
View file

@ -254,7 +254,7 @@ public class RecordCheckout {
// 2017/11/19 11:07
if (date == null && date2str.contains("/")) {
return cell.asDate(new String[]{"yyyy/M/d H:m:s", "yyyy/M/d H:m", "yyyy/M/d"});
date = cell.asDate(new String[]{"yyyy/M/d H:m:s", "yyyy/M/d H:m", "yyyy/M/d"});
}
return date;
}