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

gongchunyi

昨天 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

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