From 7f9d058a0e632be6a3daf6f46d26b69742db0720 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 十一月 2023 13:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/entity/BusinessTrip.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java b/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
index 4573f0a..3d3eac8 100644
--- a/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
+++ b/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
@@ -286,6 +286,10 @@
@TableField("business_end_time_day")
private Integer businessEndTimeDay;
+ @ApiModelProperty(value= "涓氬姟鍛�")
+ @TableField("member_id")
+ private Long memberId;
+
@TableField(exist = false)
private String pcdStart;
@@ -498,7 +502,7 @@
public String getBusinessEndTimeDay$(){
if (null == this.businessEndTimeDay){ return null; }
- switch (this.businessTransportation){
+ switch (this.businessEndTimeDay){
case 1:
return TimeCalculatorUtils.timeYestMonthDay(this.businessEndTime)+ "涓婂崍";
case 2:
--
Gitblit v1.9.1