From a840ef6aa8f89075cbaee87973cdece12e370a28 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 19 三月 2026 19:24:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/entity/WrkLastno.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkLastno.java b/src/main/java/com/zy/asrs/entity/WrkLastno.java
index 514079f..4d3d219 100644
--- a/src/main/java/com/zy/asrs/entity/WrkLastno.java
+++ b/src/main/java/com/zy/asrs/entity/WrkLastno.java
@@ -1,14 +1,15 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -24,7 +25,6 @@
*/
@ApiModelProperty(value= "绫诲瀷")
@TableId(value = "wrk_mk", type = IdType.INPUT)
- @TableField("wrk_mk")
private Integer wrkMk;
/**
@@ -46,6 +46,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
@@ -60,6 +61,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date appeTime;
/**
@@ -129,7 +131,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -161,7 +163,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -187,19 +189,19 @@
this.appeTime = appeTime;
}
- public Integer getSNo() {
+ public Integer getsNo() {
return sNo;
}
- public void setSNo(Integer sNo) {
+ public void setsNo(Integer sNo) {
this.sNo = sNo;
}
- public Integer getENo() {
+ public Integer geteNo() {
return eNo;
}
- public void setENo(Integer eNo) {
+ public void seteNo(Integer eNo) {
this.eNo = eNo;
}
--
Gitblit v1.9.1