diff --git a/physical-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java b/physical-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java index 0215304..c104e9c 100644 --- a/physical-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java +++ b/physical-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java @@ -42,9 +42,9 @@ public class JeecgEntity implements Serializable { * 创建时间 */ @Schema(description = "创建时间") - @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date createTime; /** @@ -58,9 +58,9 @@ public class JeecgEntity implements Serializable { * 更新时间 */ @Schema(description = "更新时间") - @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date updateTime; } diff --git a/physical-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java b/physical-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java index 0c4e00f..d17e599 100644 --- a/physical-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java +++ b/physical-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java @@ -94,7 +94,7 @@ public class QueryGenerator { private static SimpleDateFormat getTime() { SimpleDateFormat time = LOCAL.get(); if (time == null) { - time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + time = new SimpleDateFormat("yyyy-MM-dd HH:mm"); LOCAL.set(time); } return time; diff --git a/physical-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java b/physical-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java index c993a58..9c68f09 100644 --- a/physical-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java +++ b/physical-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java @@ -129,15 +129,15 @@ public class WebMvcConfiguration implements WebMvcConfigurer { objectMapper.configure(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES, false); //默认的处理日期时间格式,接受通过spring.jackson.date-format配置格式化模式 if (Objects.isNull(jacksonProperties.getDateFormat())) { - objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")); + objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm")); } JavaTimeModule javaTimeModule = new JavaTimeModule(); - javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))); javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - javaTimeModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern("HH:mm:ss"))); - javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + javaTimeModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern("HH:mm"))); + javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))); javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss"))); + javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm"))); objectMapper.registerModule(javaTimeModule); return objectMapper; } diff --git a/physical-launcher/src/main/resources/application-release.yml b/physical-launcher/src/main/resources/application-release.yml index fa7894c..0e6967f 100644 --- a/physical-launcher/src/main/resources/application-release.yml +++ b/physical-launcher/src/main/resources/application-release.yml @@ -1,4 +1,5 @@ server: + ip: 119.78.164.156 port: 8088 undertow: # 平替 tomcat server.tomcat.max-swallow-siz, undertow该值默认为-1 diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ClientController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ClientController.java index 3e6c5ac..2f07c39 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ClientController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ClientController.java @@ -13,13 +13,14 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.modules.database.entity.Client; import org.jeecg.modules.database.service.IClientService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import java.util.Arrays; +import java.util.*; /** * @Description: 委托方 @@ -51,8 +52,10 @@ public class ClientController extends JeecgController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(client, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); + Map customeRuleMap = new HashMap<>(); + customeRuleMap.put("name", QueryRuleEnum.RIGHT_LIKE); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(client, req.getParameterMap(), customeRuleMap); + Page page = new Page<>(pageNo, pageSize); IPage pageList = clientService.page(page, queryWrapper); return Result.OK(pageList); } @@ -140,7 +143,7 @@ public class ClientController extends JeecgController { * @param request * @param client */ - + @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, Client client) { return super.exportXls(request, client, Client.class, "委托方"); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java index 84b7e79..f3147dc 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java @@ -257,9 +257,6 @@ public class ExperimentReportController extends JeecgController { /** * 创建日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date createTime; /** * 更新人 @@ -57,8 +57,8 @@ public class SysCategory implements Serializable, Comparable { /** * 更新日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date updateTime; /** * 所属部门 diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java index 583d5fe..31b15bc 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java @@ -65,9 +65,9 @@ public class SysCheckRule { /** * 更新时间 */ - @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "更新时间") private Date updateTime; /** @@ -79,9 +79,9 @@ public class SysCheckRule { /** * 创建时间 */ - @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建时间") private Date createTime; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java index 874416c..720ffd3 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java @@ -82,8 +82,8 @@ public class SysComment implements Serializable { /** * 创建日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建日期") private Date createTime; /** @@ -94,8 +94,8 @@ public class SysComment implements Serializable { /** * 更新日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "更新日期") private Date updateTime; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java index 838dbce..e576a92 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java @@ -44,16 +44,16 @@ public class SysDataLog implements Serializable { /** * 创建日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date createTime; /** * 更新人登录名称 */ private String updateBy; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") /** * 更新日期 diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java index 963d71a..9d315a5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java @@ -94,8 +94,8 @@ public class SysDataSource { /** * 创建日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建日期") private java.util.Date createTime; /** @@ -106,8 +106,8 @@ public class SysDataSource { /** * 更新日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "更新日期") private java.util.Date updateTime; /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java index 4806b46..f217713 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java @@ -119,8 +119,8 @@ public class SysDepart implements Serializable { /** * 创建日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date createTime; /** * 更新人 @@ -129,8 +129,8 @@ public class SysDepart implements Serializable { /** * 更新日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date updateTime; /** * 租户ID diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java index 79c14ad..83ef98f 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java @@ -65,9 +65,9 @@ public class SysDepartRole { /** * 创建时间 */ - @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建时间") private java.util.Date createTime; /** @@ -79,9 +79,9 @@ public class SysDepartRole { /** * 更新时间 */ - @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "更新时间") private java.util.Date updateTime; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java index 29aa839..e1f57ca 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java @@ -57,9 +57,9 @@ public class SysDepartRolePermission { /** * 操作时间 */ - @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "操作时间") private java.util.Date operateDate; /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java index 9ead1cf..8619c01 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java @@ -63,9 +63,9 @@ public class SysFillRule { /** * 修改时间 */ - @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "修改时间") private java.util.Date updateTime; /** @@ -77,9 +77,9 @@ public class SysFillRule { /** * 创建时间 */ - @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建时间") private java.util.Date createTime; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java index 12b6985..bafd628 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java @@ -65,9 +65,9 @@ public class SysFormFile { /** * 创建日期 */ - @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建日期") private Date createTime; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java index ede0f19..e5095e1 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java @@ -114,16 +114,16 @@ public class SysGatewayRoute implements Serializable { /** * 创建日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建日期") private Date createTime; /* *//**更新人*//* @Schema(description = "更新人") private String updateBy; *//**更新日期*//* - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @Schema(description = "更新日期") private Date updateTime; *//**所属部门*//* diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.java index bf6ce42..4365530 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.java @@ -41,8 +41,8 @@ public class SysLog implements Serializable { /** * 创建时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date createTime; /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java index 4022cb7..2d322bb 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java @@ -63,8 +63,8 @@ public class SysPosition { /** * 创建时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建时间") private java.util.Date createTime; /** @@ -75,8 +75,8 @@ public class SysPosition { /** * 修改时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "修改时间") private java.util.Date updateTime; /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java index d740da2..74185b9 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java @@ -59,8 +59,8 @@ public class SysRole implements Serializable { /** * 创建时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date createTime; /** @@ -71,8 +71,8 @@ public class SysRole implements Serializable { /** * 更新时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date updateTime; /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java index 144e0d4..eda1ebb 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java @@ -77,9 +77,9 @@ public class SysRoleIndex { /** * 创建日期 */ - @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建日期") private java.util.Date createTime; /** @@ -91,9 +91,9 @@ public class SysRoleIndex { /** * 更新日期 */ - @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "更新日期") private java.util.Date updateTime; /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java index 9d637d9..1bf7ae5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java @@ -50,8 +50,8 @@ public class SysRolePermission implements Serializable { /** * 操作时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date operateDate; /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java index eebb42b..96bd518 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java @@ -57,9 +57,9 @@ public class SysTableWhiteList { /** * 创建时间 */ - @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建时间") private java.util.Date createTime; /** @@ -71,9 +71,9 @@ public class SysTableWhiteList { /** * 更新时间 */ - @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "更新时间") private java.util.Date updateTime; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java index 2bd0cff..7587cfb 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java @@ -41,22 +41,22 @@ public class SysTenant implements Serializable { /** * 创建时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date createTime; /** * 开始时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date beginDate; /** * 结束时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date endDate; /** @@ -130,8 +130,8 @@ public class SysTenant implements Serializable { /** * 更新日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date updateTime; /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java index e4abd0b..72926c5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java @@ -86,9 +86,9 @@ public class SysThirdAccount { /** * 创建日期 */ - @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date createTime; /** * 修改人 @@ -98,9 +98,9 @@ public class SysThirdAccount { /** * 修改日期 */ - @Excel(name = "修改日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "修改日期", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date updateTime; /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java index d04ab08..96aa790 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java @@ -85,16 +85,16 @@ public class SysThirdAppConfig { /** * 创建日期 */ - @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date createTime; /** * 修改日期 */ - @Excel(name = "修改日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "修改日期", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date updateTime; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java index fec5911..55acf8e 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java @@ -39,16 +39,16 @@ public class SysUserAgent implements Serializable { /** * 代理开始时间 */ - @Excel(name = "代理开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "代理开始时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date startTime; /** * 代理结束时间 */ - @Excel(name = "代理结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "代理结束时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date endTime; /** * 状态0无效1有效 @@ -68,9 +68,9 @@ public class SysUserAgent implements Serializable { /** * 创建日期 */ - @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date createTime; /** * 更新人名称 @@ -85,9 +85,9 @@ public class SysUserAgent implements Serializable { /** * 更新日期 */ - @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date updateTime; /** * 所属部门 diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java index 7c7e073..04a3c8e 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java @@ -54,8 +54,8 @@ public class AnnouncementSendModel implements Serializable { /** * 发布时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private java.util.Date sendTime; /** * 页数 diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java index e00fa85..f055d63 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java @@ -43,8 +43,8 @@ public class SysCommentVO implements Serializable { /** * 创建日期 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "创建日期") private Date createTime; diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index d1b9904..387bba3 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -62,10 +62,10 @@ public class ${entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index d5e992b..c47d88f 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -57,10 +57,10 @@ public class ${entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index e4b78b9..9379156 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -58,10 +58,10 @@ public class ${subTab.entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#elseif !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index b34674e..e06a62b 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -52,10 +52,10 @@ public class ${entityName}Page { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 53e797b..ac2c71d 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -58,10 +58,10 @@ public class ${entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index f30f27a..a7d4b14 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -57,10 +57,10 @@ public class ${entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 16e3ffb..c550ee6 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -44,10 +44,10 @@ public class ${subTab.entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#elseif !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index ce25b0a..7357aec 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -57,10 +57,10 @@ public class ${entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index ac8595e..6795a58 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -59,10 +59,10 @@ public class ${subTab.entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#elseif !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index 514aa9d..39207f3 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -54,7 +54,7 @@ public class ${entityName}Page { <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") <#else> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index dcabf35..2e9e5b0 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -57,10 +57,10 @@ public class ${entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 1b8a734..3e0f8a2 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -58,10 +58,10 @@ public class ${subTab.entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#elseif !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index 040a8d7..f354afb 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -52,10 +52,10 @@ public class ${entityName}Page { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index dcabf35..2e9e5b0 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -57,10 +57,10 @@ public class ${entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 211f990..36ce4ec 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -58,10 +58,10 @@ public class ${subTab.entityName} implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#elseif !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index 040a8d7..f354afb 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -52,10 +52,10 @@ public class ${entityName}Page { @DateTimeFormat(pattern="yyyy-MM-dd") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 84997b5..e5ae1d6 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -38,9 +38,9 @@ public class ${entityName} { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") <#elseif po.fieldDbType =='datetime'> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> @Excel(name = "${po.filedComment}", width = 15) diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai index 484f6a4..a6d385a 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai @@ -34,9 +34,9 @@ public class ${entityName} implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") <#elseif po.fieldDbType =='datetime'> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> @Excel(name = "${po.filedComment}", width = 15) diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 14c5198..38a0bcd 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -32,8 +32,8 @@ public class ${entityName} implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") <#elseif po.fieldDbType =='datetime'> - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @Schema(description = "${po.filedComment}") diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 1533307..bdbbf3b 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -36,9 +36,9 @@ public class ${subTab.entityName} implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") <#elseif po.fieldDbType =='datetime'> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index 3768768..c5cd7ac 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -33,9 +33,9 @@ public class ${entityName}Page { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") <#elseif po.fieldDbType =='datetime'> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> @Excel(name = "${po.filedComment}", width = 15) diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 4677085..4ff7b01 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -32,8 +32,8 @@ public class ${entityName} implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") <#elseif po.fieldDbType =='datetime'> - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @Schema(description = "${po.filedComment}") diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 64c0c6b..b7a912a 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -35,9 +35,9 @@ public class ${subTab.entityName} implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") <#elseif po.fieldDbType =='datetime'> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> <#if !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)> diff --git a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai index 200c284..af87988 100644 --- a/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai +++ b/physical-module-system/physical-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai @@ -31,9 +31,9 @@ public class ${entityName}Page { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") <#elseif po.fieldDbType =='datetime'> - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") <#else> @Excel(name = "${po.filedComment}", width = 15)