Merge branch 'cfclub' of http://git.iwintrue.com/liaoxg/cfc into cfclub

cfc-web/.last_build_commit

@@ -1 +1 @@
-bc8a6ca4f0787ffdcf895e71d0fbb6ae239cc466
+4128977a6d019b5e5db5d5686d544d9de2203bd9

cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1574",
+  "version": "1.0.1575",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.1574",
+      "version": "1.0.1575",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1574",
+  "version": "1.0.1575",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,19 @@
 
 ---
 
+## v1.0.1575 (2026-10-11)
+
+### Bug 修复
+- 邀请接受流程缺失 FamilyMember 记录和 avatar 字段
+
+### 其他
+- - FamilyJoinRequestService.approveJoinRequest(): 审批通过补偿创建 FamilyMember 记录，同头像策略
+- - 两处均检查重复记录（避免 mergeFamily 切换路径下插入双份）
+- - 新增 FamilyMemberMapper @Resource 注入
+- Closes: member avatar not showing after family invite join
+- 
+
+
 ## v1.0.1574 (2026-10-11)
 
 ### 重构

cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.1574
+> 当前版本: v1.0.1575
 
 ## 历史版本
 
@@ -8,6 +8,19 @@
 
 ---
 
+## v1.0.1575 (2026-10-11)
+
+### Bug 修复
+- 邀请接受流程缺失 FamilyMember 记录和 avatar 字段
+
+### 其他
+- - FamilyJoinRequestService.approveJoinRequest(): 审批通过补偿创建 FamilyMember 记录，同头像策略
+- - 两处均检查重复记录（避免 mergeFamily 切换路径下插入双份）
+- - 新增 FamilyMemberMapper @Resource 注入
+- Closes: member avatar not showing after family invite join
+- 
+
+
 ## v1.0.1574 (2026-10-11)
 
 ### 重构