Prechádzať zdrojové kódy

fix (model): 支持json数据结构3

1538940682@qq.com 3 rokov pred
rodič
commit
4519653774

+ 3 - 8
src/main/resources/template/AddPO.java.vm

@@ -27,9 +27,9 @@ public class ${className}AddPO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-	#if($column.columnName != 'id' && $column.columnName != 'create_user_id' && $column.columnName != 'create_time' &&
-		$column.columnName != 'deleted' && $column.columnName != 'update_user_id' && $column.columnName != 'update_time'
-	)
+#if($column.columnName != 'id' && $column.columnName != 'create_user_id' && $column.columnName != 'create_time' &&
+	$column.columnName != 'deleted' && $column.columnName != 'update_user_id' && $column.columnName != 'update_time'
+)
 
     /**
 	 * $column.comments
@@ -39,14 +39,9 @@ public class ${className}AddPO implements Serializable {
 #elseif($column.attrType != "String" && $column.nullable == "NO")
 	@NotNull(message = "$column.comments 不能为空")
 #end
-#if($column.attrType == "Json")
-	@ApiModelProperty(value = "$column.comments")
-	private JSONObject $column.attrname;
-#else
     @ApiModelProperty(value = "$column.comments")
     private $column.attrType $column.attrname;
 #end
-	#end
 #end
 
 }

+ 3 - 7
src/main/resources/template/UpdatePO.java.vm

@@ -27,9 +27,9 @@ public class ${className}UpdatePO implements Serializable {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-	#if($column.columnName != 'create_user_id' && $column.columnName != 'create_time' &&
-		$column.columnName != 'deleted' && $column.columnName != 'update_user_id' && $column.columnName != 'update_time'
-	)
+#if($column.columnName != 'create_user_id' && $column.columnName != 'create_time' &&
+    $column.columnName != 'deleted' && $column.columnName != 'update_user_id' && $column.columnName != 'update_time'
+)
 
     /**
 	 * $column.comments
@@ -40,12 +40,8 @@ public class ${className}UpdatePO implements Serializable {
 	@NotNull(message = "${column.comments}不能为空")
 #end
 	@ApiModelProperty(value = "$column.comments")
-#if($column.attrType == "Json")
-	private JSONObject $column.attrname;
-#else
 	private $column.attrType $column.attrname;
 #end
-	#end
 #end
 
 }