Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java

@@ -172,7 +172,7 @@ public class InspectionServiceImpl implements IInspectionService {
         for (InspectionInfoVo inspectionInfoVo : inspectionInfoVoList) {
             //航线名称
             if (CollectionUtil.isNotEmpty(airportLineMap)) {
-                if (ObjectUtil.isNotNull(airportLineMap.get(inspectionInfoVo.getInspectionLine()))) {
+                if (ObjectUtil.isNotEmpty(airportLineMap.get(inspectionInfoVo.getInspectionLine()))) {
                     inspectionInfoVo.setInspectionLineName(airportLineMap.get(inspectionInfoVo.getInspectionLine()).getFileName());
                 }
             }

tuoheng-service/tuoheng-miniprogram/src/main/resources/logback.xml

@@ -53,6 +53,7 @@
 	</appender>
 
 	<logger name="com.tuoheng" level="DEBUG" additivity="false">
+		<appender-ref ref="console" />
 		<appender-ref ref="file.async" />
 	</logger>
 	<!--log4jdbc -->