Merge remote-tracking branch 'origin/master' into test

# Conflicts:
#	sys-api-service/src/main/java/com/xy/service/SysCodeConfigureServiceImpl.java
#	sys-api/src/main/java/com/xy/service/SysCodeConfigureService.java

sys-api-feign/src/main/java/com/xy/feign/SysCodeConfigureFeign.java

@@ -0,0 +1,11 @@
+package com.xy.feign;
+
+import com.xy.FeignInterceptor;
+import com.xy.consts.ServiceConsts;
+import com.xy.service.AliSmsService;
+import com.xy.service.SysCodeConfigureService;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(value = ServiceConsts.SERVICE_NAME, configuration = FeignInterceptor.class)
+public interface SysCodeConfigureFeign extends SysCodeConfigureService {
+}

sys-api-service/src/main/java/com/xy/service/SysCodeConfigureServiceImpl.java

@@ -179,3 +179,4 @@ public class SysCodeConfigureServiceImpl extends ServiceImpl<SysCodeConfigureMap
         log.info("系统编码写入redis完成~");
     }
 }
+

sys-api/src/main/java/com/xy/service/SysCodeConfigureService.java

@@ -1,13 +1,6 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
-import com.xy.dto.MsgUserMessageDto;
-import com.xy.dto.SysCodeConfigureDto;
-import com.xy.utils.R;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 
 /**
  * <p>