Merge branch 'master' of http://192.168.100.32:3000/longsanlang/Network-Modules

# Conflicts:
#	Drivers/Modules/bc260y/BC260Y_UDP_Client5.c

Drivers/Modules/bc260y/BC260Y_UDP_Client5.c

@@ -646,13 +646,13 @@ void UDP_Client_Handle(void)
 				else
 				{
 					goto_step(STEP_START);
-					Log_Printf_Debug("\r\n>>重发次数%d < 1，重新发送\r\n", resend_counter);
+					Log_Printf_Debug("\r\n>>重发次数%d <= 1，重新发送\r\n", resend_counter);
 				}
 			}
 			else if(result == Result_Failed)
 			{
 				goto_step(STEP_ENTER_SLEEP);
-				Log_Printf_Debug("\r\n>>设置最小功能模式失败，进入睡眠\r\n");
+				Log_Printf_Debug("\r\n>>进入睡眠\r\n");
 			}
 			break;
 		case STEP_ENTER_SLEEP: // 进入睡眠