Merge branch 'dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao

zouyu

2026-01-10 0fcc6eb314fafab572def73100584d353089ee8c

 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 {};