From dec64d47a9a3a3cc133afdf5141744d90fcb49b4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 15:46:42 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipPaymentController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipPaymentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipPaymentController.java
index ee54dfc..ce5aa13 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipPaymentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipPaymentController.java
@@ -173,14 +173,13 @@
}
if (re.getOperatorId()!=null){
if (re.getOperatorId()==0){
- re.setOperatorName("总平台");
+ re.setOperatorName("平台");
}else{
TOperator operator = operatorList.stream().filter(e -> e.getId().equals(re.getOperatorId())).findFirst().orElse(null);
if (operator!=null){
re.setOperatorName(operator.getName());
}
}
-
}
}
return res;
--
Gitblit v1.7.1