From 8ce3bb68bdc2250cc4a8a3d29085443fac64615a Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 23 Sep 2022 18:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/main' into v1.2.0

---
 src/main/java/com/dji/sample/CloudApiSampleApplication.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/dji/sample/CloudApiSampleApplication.java b/src/main/java/com/dji/sample/CloudApiSampleApplication.java
index 14cca32..a3619ab 100644
--- a/src/main/java/com/dji/sample/CloudApiSampleApplication.java
+++ b/src/main/java/com/dji/sample/CloudApiSampleApplication.java
@@ -8,6 +8,7 @@
 @MapperScan("com.dji.sample.*.dao")
 @SpringBootApplication
 @EnableScheduling
+//@EnableConfigurationProperties(OssConfiguration.class)
 public class CloudApiSampleApplication {
 
 	public static void main(String[] args) {

--
Gitblit v1.9.3