From 3033ccf3878fae2c204df53be2a283f29f5853ed Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 10 十月 2025 18:17:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOtherConfig.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOtherConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOtherConfig.java
index 324006d..53b23d9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOtherConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOtherConfig.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_sys_other_config")
@ApiModel(value="TSysOtherConfig对象", description="其他设置")
-public class TSysOtherConfig implements Serializable {
+public class TSysOtherConfig extends BaseModel {
private static final long serialVersionUID = 1L;
@@ -51,9 +52,8 @@
private BigDecimal aiPrice;
@ApiModelProperty(value = "自动收货时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("delivery_time")
- private LocalDateTime deliveryTime;
+ private Integer deliveryTime;
}
--
Gitblit v1.7.1