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/queryBo.java.vm

@@ -51,6 +51,9 @@
#foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField) && $column.query)
   /** $column.columnComment */
#if($column.javaType == 'Date')
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
#end
   @ApiModelProperty("$column.columnComment")
   private $column.javaType $column.javaField;
#end