Commit 47750e34 authored by shizhilong's avatar shizhilong

Merge branch 'dev-szl' of http://gitlab.suntrayoa.com/ztgk/hzsomms into dev

parents a3ee469c c5a6a405
...@@ -39,7 +39,7 @@ public class MovementCourseInfoDTO { ...@@ -39,7 +39,7 @@ public class MovementCourseInfoDTO {
private String movementMasterId; private String movementMasterId;
@ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键") @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
private BigDecimal movementCourseId; private String movementCourseId;
@ApiModelProperty("轨号") @ApiModelProperty("轨号")
private String trackCode; private String trackCode;
......
...@@ -60,7 +60,7 @@ public class MovementCourseInfo implements Serializable { ...@@ -60,7 +60,7 @@ public class MovementCourseInfo implements Serializable {
@ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键") @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
@TableField("movement_course_id") @TableField("movement_course_id")
private BigDecimal movementCourseId; private String movementCourseId;
@ApiModelProperty("轨号") @ApiModelProperty("轨号")
@TableField("track_code") @TableField("track_code")
......
...@@ -45,7 +45,7 @@ public class MovementCourseInfoVO { ...@@ -45,7 +45,7 @@ public class MovementCourseInfoVO {
private String movementMasterId; private String movementMasterId;
@ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键") @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
private BigDecimal movementCourseId; private String movementCourseId;
@ApiModelProperty("轨号") @ApiModelProperty("轨号")
private String trackCode; private String trackCode;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment