From a02b155b5bd0ab67c893bf7bdecc50cb52671254 Mon Sep 17 00:00:00 2001 From: lhb <495598773@qq.com> Date: Fri, 18 Apr 2025 09:22:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8F=90=E5=8F=96=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/entity/cloud/BatteryStation.java | 17 ------------ .../cloud/BatteryStationCdStrategy.java | 16 ------------ .../cloud/BatteryStationCdStrategyDetail.java | 16 ------------ .../core/entity/cloud/BatteryStationDc.java | 16 ------------ .../core/entity/cloud/BatteryStationDcc.java | 16 ------------ .../core/entity/cloud/BatteryStationDj.java | 16 ------------ .../cloud/BatteryStationHdFeeStandard.java | 16 ------------ .../BatteryStationHdFeeStandardDetail.java | 16 ------------ .../entity/cloud/BatteryStationRobot.java | 16 ------------ .../core/entity/cloud/BatteryTrace.java | 16 ------------ .../hd/common/core/entity/cloud/Company.java | 16 ------------ .../cloud/HomeDataOrderSwapCollate.java | 5 ---- .../entity/cloud/HomeDataTradeCollate.java | 5 ---- .../core/entity/cloud/OrderRecharge.java | 16 ------------ .../core/entity/cloud/OrderSwapBattery.java | 16 ------------ .../entity/cloud/OrderSwapBatteryPre.java | 16 ------------ .../entity/cloud/OrderSwapBatteryStep.java | 16 ------------ .../cloud/PreOrderRelationSwapOrder.java | 5 ---- .../common/core/entity/cloud/TradeDetail.java | 16 ------------ .../common/core/entity/cloud/VehicleInfo.java | 16 ------------ .../cloud/VehicleWechatUserRelation.java | 16 ------------ .../core/entity/cloud/WalletAccount.java | 16 ------------ .../entity/cloud/WalletAccountDetail.java | 16 ------------ .../core/entity/resource/BatteryType.java | 16 ------------ .../common/core/entity/resource/CarType.java | 16 ------------ .../common/core/entity/resource/LogLogin.java | 8 ------ .../core/entity/resource/ProxyOperater.java | 26 +------------------ .../core/entity/resource/UploadFile.java | 8 ------ .../core/entity/resource/WechatAgreement.java | 16 ------------ .../core/entity/resource/WechatSwiper.java | 16 ------------ .../core/entity/resource/auth/AuthMenu.java | 16 ------------ .../core/entity/resource/auth/AuthRole.java | 20 -------------- .../resource/auth/AuthRoleResource.java | 8 ------ .../entity/resource/auth/AuthUserRole.java | 15 +---------- .../entity/resource/auth/AuthUserStation.java | 16 ------------ .../core/entity/resource/dict/AdmdvsInfo.java | 10 ------- .../core/entity/resource/dict/Dict.java | 10 ------- .../core/entity/resource/dict/DictType.java | 10 ------- .../core/entity/wechat/WechatPayPreOrder.java | 19 -------------- .../common/core/entity/wechat/WechatUser.java | 20 -------------- 40 files changed, 2 insertions(+), 584 deletions(-) diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java index 9294270..7c5c5d4 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java @@ -106,23 +106,6 @@ public class BatteryStation extends BaseEntity implements Serializable { @Schema(description = "电池数量") private Integer dcQuantity; - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; - - @Schema(description = "电池列表", hidden = true) @TableField(exist = false) private List dcList; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategy.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategy.java index 30ffdab..f70b40c 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategy.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategy.java @@ -49,22 +49,6 @@ public class BatteryStationCdStrategy extends BaseEntity implements Serializable @Schema(description = "状态：0-未启用，1-启用") private Integer status; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; @Schema(description = "详情", hidden = true) private List detailList; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategyDetail.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategyDetail.java index cbd40a0..80ce45f 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategyDetail.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategyDetail.java @@ -50,20 +50,4 @@ public class BatteryStationCdStrategyDetail extends BaseEntity implements Serial @Schema(description = "充电功率") private Double chargingPower; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDc.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDc.java index eb27f30..158079f 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDc.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDc.java @@ -76,20 +76,4 @@ public class BatteryStationDc extends BaseEntity implements Serializable { @Schema(description = "删除标志：1-已删除，0-未删除", hidden = true) private Integer delFlag; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java index b23c8e3..1a6b888 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java @@ -44,20 +44,4 @@ public class BatteryStationDcc extends BaseEntity implements Serializable { @Schema(description = "状态：1-正常，2-检修， 3-坏", requiredMode = RequiredMode.REQUIRED) @NotNull(message = "状态不能为空") private Integer status; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDj.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDj.java index 2f60343..5831c83 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDj.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDj.java @@ -58,20 +58,4 @@ public class BatteryStationDj extends BaseEntity implements Serializable { @Schema(description = "充电枪数量") private Integer gunNum; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandard.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandard.java index 466abcd..2d9968a 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandard.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandard.java @@ -78,22 +78,6 @@ public class BatteryStationHdFeeStandard extends BaseEntity implements Serializa @Schema(description = "换电时电量剩余一般的服务费") private BigDecimal fewRemainFee; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; @Schema(description = "换电费用标准细节", hidden = true) @TableField(exist = false) diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandardDetail.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandardDetail.java index 240ea33..5f10ba3 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandardDetail.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandardDetail.java @@ -63,20 +63,4 @@ public class BatteryStationHdFeeStandardDetail extends BaseEntity implements Ser @Schema(description = "谷段服务费") private BigDecimal timeServiceFee; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationRobot.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationRobot.java index 4907fa9..0039b28 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationRobot.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationRobot.java @@ -47,20 +47,4 @@ public class BatteryStationRobot extends BaseEntity implements Serializable { @Schema(description = "运行模式：1-就地，2-远程") private Integer runMode; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryTrace.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryTrace.java index c9d7f63..3dc7346 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryTrace.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryTrace.java @@ -59,20 +59,4 @@ public class BatteryTrace extends BaseEntity implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date endTime; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java index 21642cb..a83d876 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java @@ -75,20 +75,4 @@ public class Company extends BaseEntity implements Serializable { @Schema(description = "账户余额") private BigDecimal accountBalance; - - @Schema(description = "创建人", hidden = true) - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataOrderSwapCollate.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataOrderSwapCollate.java index fcc59f6..cf0ac95 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataOrderSwapCollate.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataOrderSwapCollate.java @@ -38,9 +38,4 @@ public class HomeDataOrderSwapCollate extends BaseEntity implements Serializable @Schema(description = "状态：1-进行中，未结算的，2-结算完成，3-取消的") private Integer status; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataTradeCollate.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataTradeCollate.java index 21bb474..2b8aa5a 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataTradeCollate.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataTradeCollate.java @@ -40,9 +40,4 @@ public class HomeDataTradeCollate extends BaseEntity implements Serializable { @Schema(description = "交易金额") private Integer tradeAmount; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderRecharge.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderRecharge.java index 2b836b6..9028c04 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderRecharge.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderRecharge.java @@ -52,20 +52,4 @@ public class OrderRecharge extends BaseEntity implements Serializable { @Schema(description = "删除状态：1-已删除，0-未删除", hidden = true) private Integer delFlag; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBattery.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBattery.java index da2df3e..a25bb20 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBattery.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBattery.java @@ -160,20 +160,4 @@ public class OrderSwapBattery extends BaseEntity implements Serializable { @Schema(description = "备注信息") private String remark; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryPre.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryPre.java index f2087e3..bebacf0 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryPre.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryPre.java @@ -70,20 +70,4 @@ public class OrderSwapBatteryPre extends BaseEntity implements Serializable { @Schema(description = "状态：1-预约成功，2-到店使用，3-取消，4-过期", hidden = true) private Integer status; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryStep.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryStep.java index e67ee5e..de507f3 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryStep.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryStep.java @@ -37,20 +37,4 @@ public class OrderSwapBatteryStep extends BaseEntity implements Serializable { @Schema(description = "步骤时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date stepTime; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/PreOrderRelationSwapOrder.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/PreOrderRelationSwapOrder.java index 79fa3d0..f017922 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/PreOrderRelationSwapOrder.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/PreOrderRelationSwapOrder.java @@ -38,9 +38,4 @@ public class PreOrderRelationSwapOrder extends BaseEntity implements Serializabl @Schema(description = "换电订单号") private String orderNo; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/TradeDetail.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/TradeDetail.java index fb75f0c..784805c 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/TradeDetail.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/TradeDetail.java @@ -96,22 +96,6 @@ public class TradeDetail extends BaseEntity implements Serializable { @Schema(description = "删除标识，1-已删除，0-未删除", hidden = true) private Integer delFlag; - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; - @Schema(description = "退款结果: 0-未退款, 1-退款中，2-已退款, 3-退款失败") private Integer refundResult; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java index 89a99af..55ebad9 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java @@ -106,22 +106,6 @@ public class VehicleInfo extends BaseEntity implements Serializable { @Schema(description = "组织机构代码") private String ccode; - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; - @Schema(description = "运营商Id") private String proxyOperaterId; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleWechatUserRelation.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleWechatUserRelation.java index b8a55cf..e7df048 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleWechatUserRelation.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleWechatUserRelation.java @@ -47,20 +47,4 @@ public class VehicleWechatUserRelation extends BaseEntity implements Serializabl @Schema(description = "关联人手机号", requiredMode = RequiredMode.REQUIRED) private String phone; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccount.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccount.java index eb92e4e..80b787c 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccount.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccount.java @@ -68,20 +68,4 @@ public class WalletAccount extends BaseEntity implements Serializable { @Schema(description = "引入站点") private String stationCode; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccountDetail.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccountDetail.java index 269737c..9ee12a1 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccountDetail.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccountDetail.java @@ -74,20 +74,4 @@ public class WalletAccountDetail extends BaseEntity implements Serializable { @Schema(description = "交易后赠送金额，分", requiredMode = RequiredMode.REQUIRED) @NotNull private Integer afterGiftAmount; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/BatteryType.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/BatteryType.java index 2bec44d..8d7c334 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/BatteryType.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/BatteryType.java @@ -60,20 +60,4 @@ public class BatteryType extends BaseEntity implements Serializable { @Schema(description = "尺寸，长宽高") private String size; - - @Schema(description = "创建人", hidden = true) - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/CarType.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/CarType.java index 94930d8..f404e2e 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/CarType.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/CarType.java @@ -42,20 +42,4 @@ public class CarType extends BaseEntity implements Serializable { @Schema(description = "公告号") private String announceNum; - - @Schema(description = "创建人", hidden = true) - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogLogin.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogLogin.java index ceeb37b..8abcbcd 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogLogin.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogLogin.java @@ -60,12 +60,4 @@ public class LogLogin extends BaseEntity implements Serializable { @Schema(description = "平台") private String platForm; - @Schema(description = "创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "创建者") - private String creater; - } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/ProxyOperater.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/ProxyOperater.java index 6830db9..e8c99bd 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/ProxyOperater.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/ProxyOperater.java @@ -24,14 +24,10 @@ import lombok.Setter; @Setter @TableName("hd_resource.yt_t_proxy_operater") @Schema(name = "代理运营商信息") -public class ProxyOperater implements Serializable { +public class ProxyOperater extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Hidden - private Integer pkId; - @Schema(description = "区划名称", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "区划名称不能为空") private String division; @@ -77,24 +73,4 @@ public class ProxyOperater implements Serializable { @Schema(description = "换电站数量") private Integer stationCount; - - @Schema(description = "创建人") - @TableField(fill = FieldFill.INSERT) - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @TableField(fill = FieldFill.INSERT) - private Date ctime; - - @Schema(description = "更新人", hidden = true) - @TableField(fill = FieldFill.UPDATE) - private String updater; - - @Schema(description = "更新时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @TableField(fill = FieldFill.UPDATE) - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/UploadFile.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/UploadFile.java index fd618b7..97f6045 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/UploadFile.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/UploadFile.java @@ -59,12 +59,4 @@ public class UploadFile extends BaseEntity implements Serializable { @Schema(description = "地址") private String fileUrl; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "创建者") - private String creater; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatAgreement.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatAgreement.java index de45921..0ca66fb 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatAgreement.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatAgreement.java @@ -48,20 +48,4 @@ public class WechatAgreement extends BaseEntity implements Serializable { @Schema(description = "状态：1-可用，0-不可用") private Integer status; - - @Schema(description = "创建人", hidden = true) - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatSwiper.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatSwiper.java index 0d79bda..cfe6e84 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatSwiper.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatSwiper.java @@ -47,20 +47,4 @@ public class WechatSwiper extends BaseEntity implements Serializable { @Schema(description = "状态：1-可用，0-不可用") private Integer status; - - @Schema(description = "创建人", hidden = true) - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthMenu.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthMenu.java index 0cec675..af9e9be 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthMenu.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthMenu.java @@ -55,22 +55,6 @@ public class AuthMenu extends BaseEntity implements Serializable { @Schema(description = "父级菜单id") private Integer parentId; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; @Schema(description = "子目录", hidden = true) @TableField(exist = false) diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRole.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRole.java index 61ac4a2..0b47fb3 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRole.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRole.java @@ -40,24 +40,4 @@ public class AuthRole extends BaseEntity implements Serializable { @Schema(description = "是否内置角色，内置角色不允许修改") private Integer readonly; - - @Schema(description = "创建人") - @TableField(fill = FieldFill.INSERT) - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @TableField(fill = FieldFill.INSERT) - private Date ctime; - - @Schema(description = "更新人", hidden = true) - @TableField(fill = FieldFill.UPDATE) - private String updater; - - @Schema(description = "更新时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @TableField(fill = FieldFill.UPDATE) - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRoleResource.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRoleResource.java index 5f14f94..4e11b7b 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRoleResource.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRoleResource.java @@ -35,12 +35,4 @@ public class AuthRoleResource extends BaseEntity implements Serializable { @Schema(description = "权限id") private Integer resourceId; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "创建人", hidden = true) - private String creater; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserRole.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserRole.java index 1d47568..120f1ce 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserRole.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserRole.java @@ -24,7 +24,7 @@ import lombok.Setter; @Setter @TableName("yt_auth_user_role") @Schema(name = "账号角色关系") -public class AuthUserRole implements Serializable { +public class AuthUserRole extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -35,17 +35,4 @@ public class AuthUserRole implements Serializable { @Schema(description = "角色编码") @NotBlank private String rcode; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "修改时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserStation.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserStation.java index eb0e8b9..85442cd 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserStation.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserStation.java @@ -29,9 +29,6 @@ public class AuthUserStation implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "用户ID") @NotBlank private String uid; @@ -43,17 +40,4 @@ public class AuthUserStation implements Serializable { @Schema(description = "充电站Id") @NotBlank private Integer stationId; - - @Schema(description = "创建人") - private String creater; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "修改时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/AdmdvsInfo.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/AdmdvsInfo.java index 0278ca9..1b13c86 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/AdmdvsInfo.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/AdmdvsInfo.java @@ -39,16 +39,6 @@ public class AdmdvsInfo extends BaseEntity implements Serializable { @Schema(description = "等级，1-省；2-市；3-区县") private Integer level; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; @Schema(description = "子区划", hidden = true) @TableField(exist = false) diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/Dict.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/Dict.java index d08aadc..a970c5b 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/Dict.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/Dict.java @@ -43,14 +43,4 @@ public class Dict extends BaseEntity implements Serializable { private Integer typeId; private String typeCode; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/DictType.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/DictType.java index 88aeae0..e258e69 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/DictType.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/DictType.java @@ -35,14 +35,4 @@ public class DictType extends BaseEntity implements Serializable { @Schema(description = "描述") private String mark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatPayPreOrder.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatPayPreOrder.java index bc0ad4e..5117c44 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatPayPreOrder.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatPayPreOrder.java @@ -25,9 +25,6 @@ public class WechatPayPreOrder extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "用户编码") private String wuid; @@ -86,20 +83,4 @@ public class WechatPayPreOrder extends BaseEntity implements Serializable { @Schema(description = "支付串") private String prePayResponse; - - @Schema(description = "创建人", hidden = true) - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java index 2789b42..b51d212 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java @@ -27,10 +27,6 @@ public class WechatUser extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(description = "id", hidden = true) - private Integer pkId; - @Schema(description = "微信用户id") private String wuid; @@ -70,22 +66,6 @@ public class WechatUser extends BaseEntity implements Serializable { @Schema(description = "公众号openid") private String gzhOpenid; - @Schema(description = "创建人", hidden = true) - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; - @Schema(description = "审核状态：1-待审核，2-审核成功，3-审核失败") private Integer state; }