From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

---
 src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index f88a0e6..75e27f3 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.OrderUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.sales.mapper.PaymentShippingMapper;
@@ -37,6 +39,7 @@
         return AjaxResult.success(listPage);
     }
 
+    @Log(title = "浠樻鍙戣揣", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @Operation(summary = "娣诲姞鏀粯涓庡彂璐т俊鎭�")
     @Transactional(rollbackFor = Exception.class)
@@ -47,6 +50,7 @@
         return save ? success() : error();
     }
 
+    @Log(title = "浠樻鍙戣揣", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     @Operation(summary = "淇敼鏀粯涓庡彂璐т俊鎭�")
     @Transactional(rollbackFor = Exception.class)
@@ -55,6 +59,7 @@
         return update ? success() : error();
     }
 
+    @Log(title = "浠樻鍙戣揣", businessType = BusinessType.DELETE)
     @DeleteMapping("/delete")
     @Operation(summary = "鍒犻櫎鏀粯涓庡彂璐т俊鎭�")
     @Transactional(rollbackFor = Exception.class)

--
Gitblit v1.9.3