fix(h5-partner): resolve merge conflicts for auth and sub-accounts

Merge partner session model (AuthGate, ensureSession, WeChat OAuth in Context) with sub-account routing, admin partner-account tree CRUD, upload lock, and partner staff flows.

Co-authored-by: Cursor <cursoragent@cursor.com>

server/dukang-api/src/modules/ops/admin-partners.service.ts

@@ -78,6 +78,9 @@ export class AdminPartnersService {
     if (query.phone) where.phone = { contains: query.phone };
     if (query.partnerId) where.partnerId = BigInt(query.partnerId);
     if (query.status) where.status = query.status as Prisma.EnumAccountStatusFilter['equals'];
+    if (query.isPrimary === '0' || query.isPrimary === '1') {
+      where.isPrimary = Number(query.isPrimary);
+    }
 
     const [items, total] = await Promise.all([
       this.prisma.partnerAccount.findMany({
@@ -87,6 +90,7 @@ export class AdminPartnersService {
         take: pageSize,
         include: {
           partner: { select: { id: true, companyName: true } },
+          parent: { select: { id: true, name: true, phone: true } },
         },
       }),
       this.prisma.partnerAccount.count({ where }),
@@ -152,6 +156,7 @@ export class AdminPartnersService {
             address: true,
           },
         },
+        parent: { select: { id: true, name: true, phone: true } },
       },
     });
     if (!account) throw new NotFoundException('开城合伙人账号不存在');

server/dukang-api/src/modules/ops/dto/admin-query.dto.ts

@@ -123,6 +123,10 @@ export class AdminPartnerAccountsQueryDto extends PaginationQueryDto {
   @IsOptional()
   @IsString()
   status?: string;
+
+  @IsOptional()
+  @IsString()
+  isPrimary?: string;
 }
 
 export class AdminBenefitCouponsQueryDto extends PaginationQueryDto {