阶段性更新

2025-11-20 01:27:33 +08:00
parent 92f219b575
commit cbd16a39ba
25 changed files with 7825 additions and 721 deletions
--- a/etl_billiards/.env.example
+++ b/etl_billiards/.env.example
@@ -36,8 +36,6 @@ LOG_UNKNOWN_FIELDS=true
 HASH_ALGO=sha1
 STRICT_NUMERIC=true
 ROUND_MONEY_SCALE=2
-<<<<<<< HEAD
-=======

 # 测试/离线模式
 TEST_MODE=ONLINE
@@ -46,4 +44,3 @@ TEST_JSON_TEMP_DIR=/tmp/etl_billiards_json_tmp

 # 测试数据库（可选：若设置则单元测试连入此 DSN）
 TEST_DB_DSN=
->>>>>>> main