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

2021-09-14 10:16:44 +08:00 · 2021-09-14 10:16:44 +08:00 · 662251e208
commit 662251e208
parent e314a5e333 a0c165c418
1 changed files with 2 additions and 2 deletions
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@ -26,13 +26,13 @@ import java.util.Date;
 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)
    /**