Merge remote-tracking branch 'origin/master'

src/main/resources/static/main/css/index1.css

@@ -374,14 +374,13 @@ li {
 }
 
 .swiper-slide>ul{
-    width: 1176px;
+    width: 1199px;
     height: 705px;
 	display: flex;
 	flex-wrap: wrap;
 	justify-content:space-between;
 	/* padding: 0 15px; */
     /* margin: 5px auto 0; */
-    margin-left: 13px;
 }
 
 .swiper-slide>ul>li{