From 886521e9f0f04ff262277a42b0b054b39604a544 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 18:04:20 +0800
Subject: [PATCH] 已入库的反审核之后,需要把对应的销售订单已有的任何操作都回退清除。包括入库、质检、出库、出库、发货、审批。处理原订单的库存数据

---
 src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
index 2861455..b7bfda1 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
@@ -84,11 +84,21 @@
     public String prompt() default "";
 
     /**
+     * 鏄惁鍏佽鍐呭鎹㈣ 
+     */
+    public boolean wrapText() default false;
+
+    /**
      * 璁剧疆鍙兘閫夋嫨涓嶈兘杈撳叆鐨勫垪鍐呭.
      */
     public String[] combo() default {};
 
     /**
+     * 鏄惁浠庡瓧鍏歌鏁版嵁鍒癱ombo,榛樿涓嶈鍙�,濡傝鍙栭渶瑕佽缃甦ictType娉ㄨВ.
+     */
+    public boolean comboReadDict() default false;
+
+    /**
      * 鏄惁闇�瑕佺旱鍚戝悎骞跺崟鍏冩牸,搴斿闇�姹�:鍚湁list闆嗗悎鍗曞厓鏍�)
      */
     public boolean needMerge() default false;

--
Gitblit v1.9.3