Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud

pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/CanteenDailySpuDTO.java

@@ -58,4 +58,9 @@ public class CanteenDailySpuDTO {
 	private Integer hourType;
 
 
+	@Schema(description = "商户id")
+	@NotNull
+	private Long merchantId;
+
+
 }

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java

@@ -109,6 +109,7 @@ public class CanteenSpuServiceImpl extends ServiceImpl<CanteenSpuMapper, Canteen
         LambdaQueryWrapper<CanteenDailyMenuEntity> DyWrapper = Wrappers.lambdaQuery();
         DyWrapper.eq(CanteenDailyMenuEntity::getStartTime, canteenDailySpuDTO.getStartTime());
         DyWrapper.eq(CanteenDailyMenuEntity::getHourType, canteenDailySpuDTO.getHourType());
+        DyWrapper.eq(CanteenDailyMenuEntity::getMerchantId, canteenDailySpuDTO.getMerchantId());
         List<CanteenDailyMenuEntity> list = canteenDailyMenuMapper.selectList(DyWrapper);
 
         List<Long> spuIds = list.stream().map(CanteenDailyMenuEntity::getSpuId).distinct().collect(java.util.stream.Collectors.toList());

pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml

@@ -26,7 +26,7 @@
 	</appender>
 
 	<!-- Log file debug output -->
-	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/debug.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
 			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>