@@ -1 +1 @@
-d371172917cbd1f5219a303ee8dea06bfa92c615
+02aca8a19a4bae507d16eabeeb6cc3c79ed45348
@@ -1,6 +1,6 @@
{
"name": "cfc-web",
- "version": "1.0.763",
+ "version": "1.0.764",
"private": true,
"scripts": {
"dev": "vue-cli-service serve",
@@ -4,6 +4,12 @@
---
+## v1.0.764 (2026-08-03)
+
+### Bug 修复
+- resolve merge conflict in tap-water-pollution.html (accept upstream version)
## v1.0.763 (2026-08-03)
### 新功能
# 更新日志
-> 当前版本: v1.0.763
+> 当前版本: v1.0.764
## 历史版本
@@ -8,6 +8,12 @@