From 294ab3f5a9a06c782217098e95e5542b15dc724e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 02 七月 2020 09:41:22 +0800
Subject: [PATCH] #
---
src/main/webapp/views/trayCode/tray.html | 3 +++
src/main/resources/mapper/TrayCodeMapper.xml | 2 +-
src/main/java/com/zy/asrs/entity/TrayCode.java | 16 ++++++++--------
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TrayCode.java b/src/main/java/com/zy/asrs/entity/TrayCode.java
index de749c2..cbb30ba 100644
--- a/src/main/java/com/zy/asrs/entity/TrayCode.java
+++ b/src/main/java/com/zy/asrs/entity/TrayCode.java
@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -43,7 +43,7 @@
* 缁堟
*/
@ApiModelProperty(value= "缁堟")
- private String end;
+ private String finish;
/**
* 澶囨敞
@@ -81,10 +81,10 @@
public TrayCode() {}
- public TrayCode(String trayNo,String start,String end,String memo,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
+ public TrayCode(String trayNo,String start,String finish,String memo,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
this.trayNo = trayNo;
this.start = start;
- this.end = end;
+ this.finish = finish;
this.memo = memo;
this.modiTime = modiTime;
this.modiUser = modiUser;
@@ -127,12 +127,12 @@
this.start = start;
}
- public String getEnd() {
- return end;
+ public String getFinish() {
+ return finish;
}
- public void setEnd(String end) {
- this.end = end;
+ public void setFinish(String finish) {
+ this.finish = finish;
}
public String getMemo() {
diff --git a/src/main/resources/mapper/TrayCodeMapper.xml b/src/main/resources/mapper/TrayCodeMapper.xml
index 9e926f8..c959caa 100644
--- a/src/main/resources/mapper/TrayCodeMapper.xml
+++ b/src/main/resources/mapper/TrayCodeMapper.xml
@@ -7,7 +7,7 @@
<id column="id" property="id" />
<result column="tray_no" property="trayNo" />
<result column="start" property="start" />
- <result column="end" property="end" />
+ <result column="finish" property="finish" />
<result column="memo" property="memo" />
<result column="modi_time" property="modiTime" />
<result column="modi_user" property="modiUser" />
diff --git a/src/main/webapp/views/matCode/tray.html b/src/main/webapp/views/trayCode/tray.html
similarity index 98%
rename from src/main/webapp/views/matCode/tray.html
rename to src/main/webapp/views/trayCode/tray.html
index 19f6da2..79aa48d 100644
--- a/src/main/webapp/views/matCode/tray.html
+++ b/src/main/webapp/views/trayCode/tray.html
@@ -22,4 +22,7 @@
</form>
</body>
+<script>
+
+</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1