From bfc06fc14d3c54801bfa94a138746daf3076358d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 七月 2023 18:19:28 +0800
Subject: [PATCH] 合并代码
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 3 ++-
cloud-server-management/src/main/resources/bootstrap.properties | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index cd1133f..c08ab90 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
/**
@@ -32,7 +33,7 @@
@Autowired
private TokenUtil tokenUtil;
- @Autowired
+ @Resource
private SysLogClient slClient;
private final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
diff --git a/cloud-server-management/src/main/resources/bootstrap.properties b/cloud-server-management/src/main/resources/bootstrap.properties
index 9d40542..be466a1 100644
--- a/cloud-server-management/src/main/resources/bootstrap.properties
+++ b/cloud-server-management/src/main/resources/bootstrap.properties
@@ -29,4 +29,6 @@
feign.compression.request.mime-types=text/xml,application/xml,application/json
feign.compression.request.min-request-size=4096
feign.compression.request.enabled=true
-feign.compression.response.enabled=true
\ No newline at end of file
+feign.compression.response.enabled=true
+
+mybatis-plus.configuration.map-underscore-to-camel-case=false
\ No newline at end of file
--
Gitblit v1.7.1