From afdf7d86cffe39c24b55936321bd3b3133adaf40 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期六, 29 三月 2025 16:51:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
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 15a23ed..183158e 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -1,6 +1,5 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -24,6 +23,8 @@
private int pageSize;
private int stay_time;
+
+ private String oneday;
private String begin_date;
private String end_date;
@@ -59,8 +60,7 @@
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("order_no")
- private String orderNo;
+ private String order_no;
@ApiModelProperty(value= "瑙勬牸")
private String specs;
--
Gitblit v1.9.1