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

疯狂的狮子li

2020-09-25 6101a3bf0d3f7e8de375a0b9bfa7ce71a111144c

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

@@ -60,7 +60,7 @@
#end
#end
#if($column.isPk==1)
    @TableId(value = "$column.columnName", type = IdType.AUTO)
    @TableId(value = "$column.columnName")
    private $column.javaType $column.javaField;
#else
    private $column.javaType $column.javaField;