From 211aafe0cb765b1deb5f2ef54949d64e9b0de8c3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 03 十二月 2025 17:56:36 +0800
Subject: [PATCH] yys1.海川开心-修改首页库存与采购数据不显示问题    2.海川开心-优化选择审批人时增加模糊查询    3.海川开心-协同办公部门改为可手动输入    4.海川开心-修改回款流水导出没数据问题

---
 src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index fcd7a17..3994833 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -45,6 +45,7 @@
      * 鍔充繚鍗曞彿
      */
     @ApiModelProperty("鍔充繚鍗曞彿")
+    @Excel(name = "鍔充繚鍗曞彿")
     private String orderNo;
 
     /**
@@ -105,15 +106,6 @@
     private Long num;
 
     /**
-     * 棰嗙敤鏃ユ湡
-     */
-    @ApiModelProperty("棰嗙敤鏃ユ湡")
-    @Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date adoptedDate;
-
-    /**
      * 杩涘巶鏃ユ湡
      */
     @ApiModelProperty("杩涘巶鏃ユ湡")
@@ -132,6 +124,15 @@
     private Date issueDate;
 
     /**
+     * 棰嗙敤鏃ユ湡
+     */
+    @ApiModelProperty("棰嗙敤鏃ユ湡")
+    @Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date adoptedDate;
+
+    /**
      * 绛惧悕
      */
     @Excel(name = "绛惧悕")

--
Gitblit v1.9.3