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

疯狂的狮子li

2022-01-21 c636e6909b8ed1dc1dba18bceca2554d5adde7f9

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

@@ -11,6 +11,7 @@
import lombok.experimental.Accessors;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;

/**