Merge remote-tracking branch 'origin/master'

疯狂的狮子li

2021-04-25 91c6ae307de58c5fcbf815f92a90295b4246cd51

 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