Merge remote-tracking branch 'origin/sit-three-categories' into sit-three-categories

alien-entity/src/main/java/shop/alien/entity/store/StoreCuisineCombo.java

@@ -67,3 +67,4 @@ public class StoreCuisineCombo {
 
 
 
+

alien-entity/src/main/java/shop/alien/mapper/StoreCuisineComboMapper.java

@@ -17,3 +17,4 @@ public interface StoreCuisineComboMapper extends BaseMapper<StoreCuisineCombo> {
 
 
 
+

alien-entity/src/main/java/shop/alien/mapper/StoreCuisineMapper.java

@@ -17,3 +17,4 @@ public interface StoreCuisineMapper extends BaseMapper<StoreCuisine> {
 
 
 
+

alien-entity/src/main/resources/mapper/StoreCuisineComboMapper.xml

@@ -27,3 +27,4 @@
 
 
 
+

alien-gateway/src/main/resources/logback-spring.xml

@@ -12,7 +12,7 @@
     <!-- 定义全局参数常量 -->
     <property name="log.level" value="debug"/>
     <property name="log.maxHistory" value="30"/><!-- 30表示30个 -->
-    <springProperty scope="context" name="logging.path" source="logging.path"   defaultValue="D:/project/ext/log"/>
+    <springProperty scope="context" name="logging.path" source="logging.path"   defaultValue="C:/project/ext/log"/>
     <!--输出文件前缀-->
     <property name="FILENAME" value="xiaokuihua_gateway"/>
 

alien-store/src/main/java/shop/alien/store/service/StoreCuisineComboService.java

@@ -34,3 +34,4 @@ public interface StoreCuisineComboService extends IService<StoreCuisineCombo> {
 
 
 
+

alien-store/src/main/resources/logback-spring.xml

@@ -12,7 +12,7 @@
     <!-- 定义全局参数常量 -->
     <property name="log.level" value="debug"/>
     <property name="log.maxHistory" value="30"/><!-- 30表示30个 -->
-    <springProperty scope="context" name="logging.path" source="logging.path"  defaultValue="D:/project/ext/log"/>
+    <springProperty scope="context" name="logging.path" source="logging.path"  defaultValue="C:/project/ext/log"/>
     <!--输出文件前缀-->
     <property name="FILENAME" value="alien"/>