Merge branch 'master' of http://120.79.128.142:3000/904118851/tg_factory

logs/combined.log

@@ -1,4 +1,10 @@
 <<<<<<< HEAD
+2025-03-24T15:20:16: 
+2025-03-24T15:20:16: > heiyan@1.0.0 start
+2025-03-24T15:20:16: > node tg_factory_main.js
+2025-03-24T15:20:16: 
+=======
+<<<<<<< HEAD
 2025-03-22T08:45:30: 
 2025-03-22T08:45:30: > heiyan@1.0.0 start
 2025-03-22T08:45:30: > node tg_factory_main.js
@@ -24,3 +30,4 @@
 =======
 >>>>>>> 519347472191c7e9f1e859b1d2eb999bf8af34ec
 >>>>>>> 4a0b6e7cf5bcf28c250e27a6b71e0247f72854c7
+>>>>>>> 537bc45f51548aa44125f8819fa9f2f59167c2a3

logs/out.log

@@ -1,4 +1,10 @@
 <<<<<<< HEAD
+2025-03-24T15:20:16: 
+2025-03-24T15:20:16: > heiyan@1.0.0 start
+2025-03-24T15:20:16: > node tg_factory_main.js
+2025-03-24T15:20:16: 
+=======
+<<<<<<< HEAD
 2025-03-22T08:45:30: 
 2025-03-22T08:45:30: > heiyan@1.0.0 start
 2025-03-22T08:45:30: > node tg_factory_main.js
@@ -24,3 +30,4 @@
 =======
 >>>>>>> 519347472191c7e9f1e859b1d2eb999bf8af34ec
 >>>>>>> 4a0b6e7cf5bcf28c250e27a6b71e0247f72854c7
+>>>>>>> 537bc45f51548aa44125f8819fa9f2f59167c2a3