Merge branch 'test'

src/main/java/com/cdf/service/impl/ShopServiceImpl.java

@@ -94,7 +94,9 @@ public class ShopServiceImpl extends ServiceImpl<IShopMapper, Shop> implements I
     public List<Shop> getByCategoryAndSceneNum(Integer categoryId, String sceneNum) {
         LambdaQueryWrapper<Shop> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Shop::getCategoryId,categoryId);
-        wrapper.eq(Shop::getSceneUrl,sceneNum);
+        if(StringUtils.isNotBlank(sceneNum)){
+            wrapper.eq(Shop::getSceneUrl,sceneNum);
+        }
         return this.list(wrapper);
     }
 }

src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/home/logs/cdf" />
+	<property name="log.path" value="/home/test/logs/cdf" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->