From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期三, 18 十月 2023 11:40:34 +0800 Subject: [PATCH] #获取正常还车 --- server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java index 60fc871..8d508cd 100644 --- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java +++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java @@ -91,7 +91,6 @@ private String backLockId; @ApiModelProperty(value = "杩樿溅鏃堕棿") - @ExcelColumn(name="褰掕繕鏃堕棿",index = 9,width = 10,align = HorizontalAlignment.CENTER)) private Date backDate; @ApiModelProperty(value = "杩樿溅鎸囦护缂栫爜") @@ -137,19 +136,23 @@ private String pricingDetailId; @ApiModelProperty(value = "鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�") - private String isHoliday; + private Integer isHoliday; @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝e父杩樿溅 1寮哄埗杩樿溅") private Integer backType; - @ApiModelProperty(value = "杩樿溅鍘熷洜") + @ApiModelProperty(value = "杩樿溅鍘熷洜(鍑忓厤鏃堕暱鍘熷洜涔熶娇鐢ㄨ鍙傛暟浼犲��)") private String backReason; - @ApiModelProperty(value = "杩樿溅澶囨敞") + @ApiModelProperty(value = "杩樿溅澶囨敞(鍑忓厤鏃堕暱澶囨敞涔熶娇鐢ㄨ鍙傛暟浼犲��)") private String backInfo; @ApiModelProperty(value = "寮哄埗杩樿溅鎿嶄綔浜�(鍏宠仈system_user)") private String backUserid; + @ApiModelProperty(value = "楠戣鏃堕暱") + @TableField(exist = false) + private Integer rideTime; + } -- Gitblit v1.9.3