Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.

sxq

2021-06-11 56eba9cded865648465bc2c5815d47441e0457b1

1
2
3
4
5
6
7
8
9
package com.ruoyi.demo.feign.constant;
 
public class FeignTestConstant {
 
    public static final String BAIDU_NAME = "baidu";
 
    public static final String BAIDU_URL = "http://www.baidu.com";
 
}