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

AprilWind

2024-05-27 1bd40a0cff850e1c6dd41c6c606d48d31b9b76f6

 ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java

@@ -21,4 +21,9 @@
    */
   int index() default -1;

    /**
     * 合并需要依赖的其他字段名称
     */
    String[] mergeBy() default {};

}