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

疯狂的狮子li

2021-08-18 e3d90b820d79958d4d7190d5e222d8fc7f5afc43

 ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

@@ -11,7 +11,6 @@
 * @author ${author}
 * @date ${datetime}
 */
@CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}> {

}