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

疯狂的狮子li

2021-09-14 662251e208e58a9940efb200457c49ed342cd06f

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

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

@@ -26,13 +26,13 @@
public class ${ClassName}Vo {

    private static final long serialVersionUID = 1L;

#if($pkColumn.isPk == 1)
    /**
     *  $pkColumn.columnComment
     */
    @ApiModelProperty("$pkColumn.columnComment")
    private ${pkColumn.javaType} ${pkColumn.javaField};

#end
#foreach ($column in $columns)
#if($column.isList && $column.isPk!=1)
    /**