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

疯狂的狮子li

2021-04-14 f093da99ecb963d19d62dc0f242f00b20bc8895c

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

@@ -32,7 +32,7 @@
    @Override
    public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
        ${ClassName} db = this.baseMapper.selectById(${pkColumn.javaField});
        return BeanUtil.toBean(db, ${ClassName}Vo.class)
        return BeanUtil.toBean(db, ${ClassName}Vo.class);
    }

    @Override