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

疯狂的狮子li

2022-01-12 5413b37d71ddbaa42dc6f1ba7b885a322b9a3871

 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 {