Merge branch 'yang_control_fix' into yang

# Conflicts:
#	app/Http/Controllers/TestController.php

app/Services/NewOrderCountingRecordService.php

@@ -475,8 +475,10 @@ class NewOrderCountingRecordService
     private function getTtl($dateStr, $unit)
     {
         if ($this->isNotCurrentDate($dateStr, $unit)) {
+            LogService::log('NewOrderCountingRecordService', '缓存设置为永久', $dateStr);
             $ttl = config('cache.expirations.forever');//非当前日期的缓存为永久
         } else {
+            LogService::log('NewOrderCountingRecordService', '缓存设置为临时', $dateStr);
             $ttl = config('cache.expirations.orderCountingRecord');//当前日期缓存为1800s
         }
         return $ttl;