From 8f903210610b4dc084a72d4ca9f3d8086e5972eb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 24 三月 2026 15:35:54 +0800
Subject: [PATCH] feat:1.生产报工（销售订单不创建生产订单） 2.报工增加投入总量 3.报工不扣投入库存数量
---
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