From 84e12ecd3923f28b62b8659b138a554b0f6e084d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 30 一月 2026 15:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
index 3c333fa..8d3db1d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
@@ -124,7 +124,7 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public Boolean rollerWaitingBool(){
+ public Boolean getRollerWaitingBool(){
if (null == this.rollerWaiting){ return null; }
switch (this.rollerWaiting){
case 1:
--
Gitblit v1.9.1