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

cfc-backend/src/main/java/com/etotem/cfc/controller/admin/SupplyTeamController.java

@@ -70,7 +70,7 @@ public class SupplyTeamController {
             @RequestAttribute("userId") Long userId) {
         Long systemId = ParamUtils.getLong(params.get("systemId"));
         Long familyId = ParamUtils.getLong(params.get("familyId"));
-        var relation = supplyCustomerRelationService.getRelationByFamily(systemId, familyId);
+        Object relation = supplyCustomerRelationService.getRelationByFamily(systemId, familyId);
         return Result.success(relation);
     }
 }

cfc-backend/src/main/java/com/etotem/cfc/service/ProductOrderService.java

@@ -142,6 +142,9 @@ public class ProductOrderService {
     @Resource
     private SupplyHierarchyService supplyHierarchyService;
 
+    @Resource
+    private SupplyCustomerRelationService supplyCustomerRelationService;
+
     @Resource
     private SupplyCustomerRelationMapper supplyCustomerRelationMapper;
 

cfc-backend/src/main/java/com/etotem/cfc/service/SupplyCustomerRelationService.java

@@ -59,7 +59,6 @@ public class SupplyCustomerRelationService {
             FamilyMember parentMember = familyMemberMapper.selectOne(
                 new LambdaQueryWrapper<FamilyMember>()
                     .eq(FamilyMember::getFamilyId, relation.getFamilyId())
-                    .eq(FamilyMember::getRole, "parent")
                     .orderByAsc(FamilyMember::getGeneration)
                     .last("LIMIT 1")
             );

cfc-web/.last_build_commit

@@ -1 +1 @@
-78bc1b329a155e5954d75bf647dd7a7e43feaf67
+d4171dd6ffa10f4eac4199ebcce74046f72d320b

cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1510",
+  "version": "1.0.1511",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.1510",
+      "version": "1.0.1511",
       "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.1511",
+  "version": "1.0.1512",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

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

@@ -4,6 +4,12 @@
 
 ---
 
+## v1.0.1512 (2026-10-05)
+
+### Bug 修复
+- 修复远程提交3处编译错误 - ProductOrderService 漏注入 supplyCustomerRelationService / SupplyTeamController var改显式类型 / SupplyCustomerRelationService 移除不存在的 FamilyMember.getRole()
+
+
 ## v1.0.1511 (2026-10-05)
 
 ### 新功能

cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.1511
+> 当前版本: v1.0.1512
 
 ## 历史版本
 
@@ -8,6 +8,12 @@
 
 ---
 
+## v1.0.1512 (2026-10-05)
+
+### Bug 修复
+- 修复远程提交3处编译错误 - ProductOrderService 漏注入 supplyCustomerRelationService / SupplyTeamController var改显式类型 / SupplyCustomerRelationService 移除不存在的 FamilyMember.getRole()
+
+
 ## v1.0.1511 (2026-10-05)
 
 ### 新功能