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

疯狂的狮子li

2021-04-08 8b37eca24180ea35052bba0538e18b86d1c945e0

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

@@ -20,7 +20,7 @@
public class ${ClassName}EditBo {

#foreach ($column in $columns)
#if($column.isEdit)
#if($column.isEdit || $column.isPk==1)

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")