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

疯狂的狮子li

2021-06-02 a4edce5a93628e459f0c63071e6383383d86520c

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

@@ -24,6 +24,7 @@

#foreach ($column in $columns)
#if($column.isInsert && $column.isPk!=1)

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
#if($column.javaType == 'Date')