Merge branch 'test' into 'master'

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/controller/HomePageController.java

@@ -63,7 +63,7 @@ public class HomePageController {
     @PostMapping("/without/getBanner")
     public ResponseVO<List<OprationBanner>> getBanner(){
         List<OprationBanner> banners = iOprationBannerService.getList(PLATFORM_MERCHANT_ID);
-        return new ResponseVO<List<OprationBanner>>(MallResponseEnum.SUCCESS,banners);
+        return new ResponseVO<>(MallResponseEnum.SUCCESS,banners);
     }
 
     @ApiOperation(value = "获取楼层")

mall-server-front/src/main/java/com/fzm/mall/server/front/system/controller/SysConfigController.java

@@ -3,17 +3,16 @@ package com.fzm.mall.server.front.system.controller;
 
 import com.fzm.mall.server.front.base.ResponseVO;
 import com.fzm.mall.server.front.constant.MallResponseEnum;
-import com.fzm.mall.server.front.goods.model.Banner;
 import com.fzm.mall.server.front.system.model.SysConfig;
 import com.fzm.mall.server.front.system.service.ISysConfigService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 
 /**
  * <p>
@@ -32,12 +31,18 @@ public class SysConfigController {
 
     @ApiOperation(value = "获取logo")
     @PostMapping("/without/getLogo")
-    public ResponseVO<String> getLogo(){
+    public ResponseVO<String> getLogo() {
         String key = "coin_logo";
         SysConfig sys = sysConfigService.getByKey(key);
-        if(sys==null){
-            return new ResponseVO<>(MallResponseEnum.SUCCESS,"");
+        if (sys == null) {
+            return new ResponseVO<>(MallResponseEnum.SUCCESS, "");
         }
-        return new ResponseVO<>(MallResponseEnum.SUCCESS,sys.getDictValue());
+        return new ResponseVO<>(MallResponseEnum.SUCCESS, sys.getDictValue());
+    }
+
+    @ApiOperation(value = "获取服务器时间")
+    @PostMapping("/without/read/systemTime")
+    public ResponseVO<String> systemTime() {
+        return new ResponseVO<>(MallResponseEnum.SUCCESS, new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Calendar.getInstance().getTime()));
     }
 }

mall-server-front/src/main/resources/mapper/goods/OprationBannerMapper.xml

@@ -8,6 +8,6 @@
         from opration_banner b
         left join goods_spu s on b.banner_type = 1 and b.number = s.goods_id
         where b.merchant_id = #{merchantId} and b.status = 0
-        order by b.display_order desc
+        order by b.display_order
     </select>
 </mapper>