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

疯狂的狮子li

2020-03-19 b1afb78ca252faa5b05a293f1b7467b1315c980f

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

@@ -64,16 +64,8 @@
#if($column.isPk==1)
    @TableId(value = "$column.columnName", type = IdType.AUTO)
    private $column.javaType $column.javaField;

#end
#end
#foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField))
#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
#set($AttrName=$column.javaField)
#else
    private $column.javaType $column.javaField;
#end
#end
#end
}