Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-14 7b7ae2fbc3c43cf08949b2fd8949ea6c17b3c129

 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);
    }