From b3f85b60ba9e39572e686009d36b5e5d7e81e910 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 七月 2019 20:30:10 +0800
Subject: [PATCH] 合并远程信息

---
 java110-config/src/main/java/com/java110/config/properties/OrderProperties.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/java110-config/src/main/java/com/java110/config/properties/OrderProperties.java b/java110-config/src/main/java/com/java110/config/properties/OrderProperties.java
index 84f9c7e..b0b0dcc 100644
--- a/java110-config/src/main/java/com/java110/config/properties/OrderProperties.java
+++ b/java110-config/src/main/java/com/java110/config/properties/OrderProperties.java
@@ -1,6 +1,7 @@
 package com.java110.config.properties;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 
 /**
@@ -8,8 +9,9 @@
  * Created by wuxw on 2017/4/25.
  */
 
-@ConfigurationProperties(prefix = "java110.order",locations="classpath:config/order.properties")
+@ConfigurationProperties(prefix = "java110.order")
 @Component("orderProperties")
+@PropertySource("classpath:config/order.properties")
 public class OrderProperties {
 
     private String deleteOrderAsyn;

--
Gitblit v1.8.0