Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2021-12-20 673b225da2cae462b98c180a76b50e369e23a964

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

@@ -6,8 +6,9 @@
 * 数据权限组
 *
 * @author Lion Li
 * @version 3.5.0
 */
@Target(ElementType.METHOD)
@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DataPermission {