From a8ab74fdbc4e590a4c9778d447538c3bc30925e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 08:54:44 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs into gdasrs
---
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 3bad406..0d8a904 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -23,8 +23,8 @@
private String bname; //鐢ㄦ埛ID
private String lgnum; //瑙勬牸
- private String type; // 鍟嗗搧绫诲埆
- private String mnemonic; // 鍔╄鐮�
+ private String type; // 鐗╂枡绫诲埆
+ private String color; // 棰滆壊
private String supplier; // 渚涘簲鍟�
private String warehouse; // 浠撳簱
private String brand; // 鍝佺墝
@@ -142,7 +142,7 @@
this.bname = bname;
}
public String getIo_time() {
- return io_time;
+ return io_time.substring(0,19);
}
public void setIo_time(String io_time) {
this.io_time = io_time;
--
Gitblit v1.9.1