Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-05-22 019c945c19ef6941adaea1f6d2f5e59649308892

 src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java

@@ -84,6 +84,11 @@
    public String prompt() default "";



    /**

     * 是否允许内容换行 
     */

    public boolean wrapText() default false;



    /**

     * 设置只能选择不能输入的列内容.

     */

    public String[] combo() default {};