Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetActionCallbackController.java → liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatActionCallbackController.java

@@ -13,7 +13,7 @@ import java.io.PrintWriter;
 @RestController
 @RequestMapping("/actionCallback")
 @Slf4j
-public class SweetActionCallbackController {
+public class SweetWechatActionCallbackController {
 
     @GetMapping("record")
     @ApiOperation("get")

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetLoginController.java → liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatLoginController.java

@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "小程序登陆")
 @RestController
-@RequestMapping("/sweet-login")
-public class SweetLoginController {
+@RequestMapping("/wechatLogin")
+public class SweetWechatLoginController {
 
     @Autowired
     private SweetLoginServiceImpl sweetLoginService;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetTemplateController.java → liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatTemplateController.java

@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "公众号模版消息")
 @RestController
-@RequestMapping("/sweet-template")
-public class SweetTemplateController {
+@RequestMapping("/wechatTemplate")
+public class SweetWechatTemplateController {
 
     @Autowired
     private SweetTemplateServiceImpl sweetTemplateService;