From fc02394c0f2021dd4d7d71e0e0881d76fafd3aca Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 14 八月 2025 20:06:10 +0800
Subject: [PATCH] update
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml | 1 +
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tDriverPromotionActivity_add.html | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
index 7514657..6a1dbeb 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
@@ -34,6 +34,7 @@
<if test="null != abnormalStatus">
and o.payStatus = #{abnormalStatus}
</if>
+ order by o.createTime desc
</select>
</mapper>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tDriverPromotionActivity_add.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tDriverPromotionActivity_add.html
index 6a85b54..2693d1a 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tDriverPromotionActivity_add.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tDriverPromotionActivity_add.html
@@ -167,7 +167,7 @@
var ajax = new $ax(Feng.ctxPath + "/tDriverPromotionActivity/add", function(data){
if(data=="602"){
- Feng.error("活动时间已重复");
+ Feng.error("该区域活动时间存在重复时间段，请核实后添加！");
}else {
Feng.success("添加成功!");
TDriverPromotionActivityInfoDlg.close();
--
Gitblit v1.7.1