Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-07-02 d6ca9e548d9c11be3281de1ddae392e276dc2a3d

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

@@ -50,9 +50,6 @@
#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