From 03dfa1de5279c75a4206f59226d871823bdbe72e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 10:59:41 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into local_20221024

---
 flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java b/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java
index b21df19..44091bd 100644
--- a/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java
@@ -45,7 +45,7 @@
     @PostMapping("/update")
     @Authorization
     ResultData update(@RequestBody AutomessageSysSettings automessageSysSettings,@CurrentUser SysUser sysUser){
-        automessageSysSettings.setUpdateUserId(sysUser.getUserId().intValue());
+        automessageSysSettings.setUpdateUserId(sysUser.getUserId());
         automessageSysSettings.setUpdateTime(LocalDateTime.now());
         return  sysSettingsService.update(automessageSysSettings);
     }

--
Gitblit v1.7.1