Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-12-16 d2c6e27d07a139b624df7fe2ee62a9fc1d6377e7

 ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java

@@ -7,7 +7,7 @@
 *
 * @author Lion Li
 */
@Target(ElementType.METHOD)
@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DataPermission {