From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConstants.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConstants.java
index 800b992..f558446 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConstants.java
@@ -29,7 +29,7 @@
// 瀹℃壒閫氳繃缁欑敵璇蜂汉锛氱敵璇峰凡瀹℃牳閫氳繃
String visitAuditSuccess = "visitAuditSuccess";
// 瀹℃壒椹冲洖缁欑敵璇蜂汉锛氱敵璇峰凡琚┏鍥�
- String visitAuditFail = "visitWaitAudit";
+ String visitAuditFail = "visitAuditFail";
// 缁欏鎵逛汉锛氱敵璇峰緟鎮ㄥ鎵�
String visitWaitAudit = "visitWaitAudit";
}
@@ -46,7 +46,7 @@
// 瀹℃壒椹冲洖缁欑敵璇蜂汉锛氱敵璇峰凡琚┏鍥�
String visitReportAuditFail = "visitReportAuditFail";
// 缁欏鎵逛汉锛氱敵璇峰緟鎮ㄥ鎵�
- String visitReportWaitAudit = "visitReportAuditSuccess";
+ String visitReportWaitAudit = "visitReportWaitAudit";
}
@@ -71,8 +71,10 @@
String carUseBookAuditSuccess = "carUseBookAuditSuccess";
//鐢ㄨ溅鐢宠-瀹℃壒椹冲洖閫氱煡锛堢粰鐢宠浜猴級锛氥��
String carUseBookAuditFail = "carUseBookAuditFail";
- //鐢ㄨ溅鐢宠-瀹℃壒椹冲洖閫氱煡锛堢粰鐢宠浜猴級锛氥��
+ //鐢ㄨ溅鐢宠-寰呭鎵癸紙缁欑敵璇蜂汉锛夛細銆�
String carUseBookWaitAudit = "carUseBookWaitAudit";
+ //鐢ㄨ溅鐢宠-寰呭鎵癸紙缁欑敵璇蜂汉锛夛細銆�
+ String carUseBookCancel = "carUseBookCancel";
}
@@ -103,7 +105,7 @@
// 瀹℃壒閫氳繃缁欑敵璇蜂汉锛氱敵璇峰凡瀹℃牳閫氳繃
String platformBookAuditSuccess = "platformBookAuditSuccess";
// 瀹℃壒椹冲洖缁欑敵璇蜂汉锛氱敵璇峰凡琚┏鍥�
- String platformBookAuditFail = "platformBookWaitAudit";
+ String platformBookAuditFail = "platformBookAuditFail";
// 缁欏鎵逛汉锛氱敵璇峰緟鎮ㄥ鎵�
String platformBookWaitAudit = "platformBookWaitAudit";
}
@@ -136,6 +138,8 @@
String platformJobStopErr = "platformJobStopErr";
// 杩愯緭浠诲姟涓嬭揪 锛堢粰鍙告満锛�
String platformJobNewJob = "platformJobNewJob";
+ // 杩愯緭浠诲姟鍙栨秷 锛堢粰鍙告満锛�
+ String platformJobCancel = "platformJobCancel";
}
--
Gitblit v1.9.3