From cd16d710415a86e2012bdac8badafeda0bec0b61 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 09 五月 2024 16:57:09 +0800
Subject: [PATCH] 合并代码
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 1 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTimeInfo.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
index ffbc64e..4fbb254 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
@@ -404,6 +404,7 @@
@TableField("destination")
private String destination;
private Integer isplatPay;
+ @TableField(exist = false)
private BigDecimal freeMoney;
/**
* 补差价金额
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTimeInfo.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTimeInfo.java
index 0288d75..7e2fb4f 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTimeInfo.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTimeInfo.java
@@ -11,7 +11,7 @@
@Data
@ApiModel
public class OrderTimeInfo {
- @ApiModelProperty("截单时间")
+ @ApiModelProperty("接单时间")
private String snatchOrderTime;
@ApiModelProperty("取件时间")
private String startServiceTime;
--
Gitblit v1.7.1