904118851 5 月之前
父節點
當前提交
8ef81deafb
共有 4 個文件被更改,包括 8 次插入36 次删除
  1. 4 18
      logs/combined.log
  2. 4 18
      logs/out.log
  3. 二進制
      src/api/hy/qr.gif
  4. 二進制
      src/api/hy/qr_resized.gif

+ 4 - 18
logs/combined.log

@@ -1,18 +1,4 @@
-<<<<<<< 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
-2025-03-22T08:45:30: 
-=======
-<<<<<<< HEAD
-2025-03-24T14:56:12: 
-2025-03-24T14:56:12: > heiyan@1.0.0 start
-2025-03-24T14:56:12: > node tg_factory_main.js
-2025-03-24T14:56:12: 
-=======
-2025-03-20T18:48:17: 
-2025-03-20T18:48:17: > heiyan@1.0.0 start
-2025-03-20T18:48:17: > node tg_factory_main.js
-2025-03-20T18:48:17: 
->>>>>>> 745b26fe7185d71d02b982cd888bf012c3059d11
->>>>>>> 519347472191c7e9f1e859b1d2eb999bf8af34ec
+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: 

+ 4 - 18
logs/out.log

@@ -1,18 +1,4 @@
-<<<<<<< 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
-2025-03-22T08:45:30: 
-=======
-<<<<<<< HEAD
-2025-03-24T14:56:12: 
-2025-03-24T14:56:12: > heiyan@1.0.0 start
-2025-03-24T14:56:12: > node tg_factory_main.js
-2025-03-24T14:56:12: 
-=======
-2025-03-20T18:48:17: 
-2025-03-20T18:48:17: > heiyan@1.0.0 start
-2025-03-20T18:48:17: > node tg_factory_main.js
-2025-03-20T18:48:17: 
->>>>>>> 745b26fe7185d71d02b982cd888bf012c3059d11
->>>>>>> 519347472191c7e9f1e859b1d2eb999bf8af34ec
+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: 

二進制
src/api/hy/qr.gif


二進制
src/api/hy/qr_resized.gif