From 5d7054c42cfee40abbe28be89e151c13f5d04f5f Mon Sep 17 00:00:00 2001
From: sangzhigang <sangzhigang@hongruiinfo.com>
Date: 星期五, 05 十一月 2021 15:31:12 +0800
Subject: [PATCH] 1、新增产权登记2、修复采购管理关于流程调拨采购领用bug
---
java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java b/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java
index aefbb3f..ac70f61 100755
--- a/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java
@@ -1,6 +1,7 @@
package com.java110.dto.machine;
import com.java110.dto.PageDto;
+import com.java110.dto.carInoutPayment.CarInoutPaymentDto;
import java.io.Serializable;
import java.util.Date;
@@ -13,7 +14,13 @@
* @Version 1.0
* add by wuxw 2019/4/24
**/
-public class CarInoutDto extends PageDto implements Serializable {
+public class CarInoutDto extends CarInoutPaymentDto implements Serializable {
+
+ //鐘舵�侊紝100300 杩涘満鐘舵�� 100400 鏀粯瀹屾垚 100500 绂诲満鐘舵�� 100600 鏀粯瓒呮椂閲嶆柊鏀粯
+ public static final String STATE_IN = "100300";
+ public static final String STATE_PAY = "100400";
+ public static final String STATE_OUT = "100500";
+ public static final String STATE_REPAY = "100600";
private String inTime;
@@ -24,6 +31,9 @@
private String[] states;
private String communityId;
private String outTime;
+ private String paId;
+ private long hours;
+ private long min;
private Date createTime;
@@ -112,4 +122,28 @@
public void setStateName(String stateName) {
this.stateName = stateName;
}
+
+ public String getPaId() {
+ return paId;
+ }
+
+ public void setPaId(String paId) {
+ this.paId = paId;
+ }
+
+ public long getHours() {
+ return hours;
+ }
+
+ public void setHours(long hours) {
+ this.hours = hours;
+ }
+
+ public long getMin() {
+ return min;
+ }
+
+ public void setMin(long min) {
+ this.min = min;
+ }
}
--
Gitblit v1.8.0