Merge remote-tracking branch 'origin/release-201844-wangcz' into release-201844-wangcz

src/main/java/com/uas/platform/b2c/advertise/ad/api/CarouselsController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
@@ -34,6 +35,6 @@ public class CarouselsController {
      */
     @RequestMapping(value = "/{module}", method = RequestMethod.GET)
     public List<LinkedHashMap> getCarousels(@PathVariable("module") String module) {
-        return carouselService.getCarousels(module);
+        return new ArrayList<>();
     }
 }