Merge branch 'dev' into base-modify

37bbee04 · 周健威 · 021f2f21 · 2baf6a63 · 37bbee04
Commit 37bbee04 authored Aug 29, 2019 by 周健威
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

VehicleModel.java ...n/java/com/xxfc/platform/vehicle/entity/VehicleModel.java +1 -1

No files found.
--- a/xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java
+++ b/xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java
@@ -163,5 +163,5 @@ public class VehicleModel implements Serializable {
 	@Column(name = "intro")
 	@ApiModelProperty(value = "简介")
-	private Integer intro;
+	private String intro;
 }