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

疯狂的狮子li

2021-11-25 af25588b88a727b6c945796e3cf34ed3d4f05e89

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

@@ -79,7 +79,12 @@
    public Boolean insertByBo(${ClassName}Bo bo) {
        ${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class);
        validEntityBeforeSave(add);
        return save(add);
        boolean flag = save(add);
#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
        if (flag) {
            bo.set$pk(add.get$pk());
        }
        return flag;
    }

    @Override