Commits · fac728f40e437f27126e8e26f2fd8689a887857b · mobile-group / galaxy-iOS

04 Feb, 2024 2 commits
- 主申请人逻辑 · fac728f4
  pete谢兆麟 authored Feb 04, 2024
  
  fac728f4
- // 学位信息 · 1060d1f9
  Steven杜宇 authored Feb 04, 2024
  
  1060d1f9
02 Feb, 2024 13 commits
- Merge branch 'develop' into xiezhaolin · 502f58ef
  pete谢兆麟 authored Feb 02, 2024
```
# Conflicts:
#	galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/PickerView/YHFormPickerView.swift
#	galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
```
  502f58ef
- // 选择器 · 28ba8925
  Steven杜宇 authored Feb 02, 2024
  
  28ba8925
- 主申请人数据save和submit · 001f2ce1
  pete谢兆麟 authored Feb 02, 2024
  
  001f2ce1
- Merge branch 'develop' into duyu · 69daf5ab
  Steven杜宇 authored Feb 02, 2024
  
  69daf5ab
- // 配偶基本信息 · 117605e1
  Steven杜宇 authored Feb 02, 2024
  
  117605e1
- 个人信息表 UI 优化 · e8c68bf6
  David黄金龙 authored Feb 02, 2024
  
  e8c68bf6
- 完成我的评分优化 · 6c48e326
  David黄金龙 authored Feb 02, 2024
  
  6c48e326
- 我的评分 UI 及接口联调 · eb6b71fb
  David黄金龙 authored Feb 02, 2024
  
  eb6b71fb
- 保存接口 · 5f0c690b
  pete谢兆麟 authored Feb 02, 2024
  
  5f0c690b
- Merge commit '1f0c48aa' into davidhuang · 49a09c69
  David黄金龙 authored Feb 02, 2024
```
* commit '1f0c48aa':
  // 色值统一
```
  49a09c69
- 完成我的评分的接口联调 · 6d1348d2
  David黄金龙 authored Feb 02, 2024
  
  6d1348d2
- Merge branch 'duyu' into develop · 1f0c48aa
  Steven杜宇 authored Feb 02, 2024
  
  1f0c48aa
- // 色值统一 · afe744f0
  Steven杜宇 authored Feb 02, 2024
  
  afe744f0
01 Feb, 2024 25 commits
- 添加基本资料的文件夹 · b9f9ad0f
  David黄金龙 authored Feb 01, 2024
  
  b9f9ad0f
- 完成入口的UI 及接口联调 · 054eb999
  David黄金龙 authored Feb 01, 2024
  
  054eb999
- 一处优化 · b7ecc6a6
  David黄金龙 authored Feb 01, 2024
  
  b7ecc6a6
- Merge commit '1afd2a53' into davidhuang · 3b1dbaaf
  David黄金龙 authored Feb 01, 2024
```
* commit '1afd2a53':
  // 配偶初始信息
  // 配偶初始信息
```
  3b1dbaaf
- 处理填写列表弹窗 · b95ef38c
  David黄金龙 authored Feb 01, 2024
  
  b95ef38c
- Merge branch 'develop' into duyu · 1afd2a53
  Steven杜宇 authored Feb 01, 2024
  
  1afd2a53
- // 配偶初始信息 · 18826261
  Steven杜宇 authored Feb 01, 2024
  
  18826261
- 填写列表 UI 细化 · a05191bb
  David黄金龙 authored Feb 01, 2024
  
  a05191bb
- Merge commit '10f51c33' into davidhuang · 0aa8b073
  David黄金龙 authored Feb 01, 2024
```
* commit '10f51c33':
  主申请人逻辑

# Conflicts:
#	galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
```
  0aa8b073
- UI 优化 · c9672427
  David黄金龙 authored Feb 01, 2024
  
  c9672427
- Merge branch 'develop' into duyu · d02e3f34
  Steven杜宇 authored Feb 01, 2024
  
  d02e3f34
- // 配偶初始信息 · c995226c
  Steven杜宇 authored Feb 01, 2024
  
  c995226c
- Merge branch 'xiezhaolin' into develop · 10f51c33
  pete谢兆麟 authored Feb 01, 2024
```
# Conflicts:
#	galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
```
  10f51c33
- 主申请人逻辑 · 22900907
  pete谢兆麟 authored Feb 01, 2024
  
  22900907
- 完成服务中心第二个主界面的接口调试 · 975d8be8
  David黄金龙 authored Feb 01, 2024
  
  975d8be8
- 添加测试代码 · beaab946
  David黄金龙 authored Feb 01, 2024
  
  beaab946
- Merge commit 'f3c50fea' into davidhuang · 48876435
  David黄金龙 authored Feb 01, 2024
```
* commit 'f3c50fea':
  // alertView
  // 家庭成员接口

# Conflicts:
#	galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
```
  48876435
- 服务中心第二个主界面 · 24f42e23
  David黄金龙 authored Feb 01, 2024
  
  24f42e23
- Merge branch 'develop' into duyu · f3c50fea
  Steven杜宇 authored Feb 01, 2024
```
# Conflicts:
#	galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
```
  f3c50fea
- // alertView · aa2a3762
  Steven杜宇 authored Feb 01, 2024
  
  aa2a3762
- UI 微调 · e741ca53
  David黄金龙 authored Feb 01, 2024
  
  e741ca53
- Merge commit '3257c54a' into davidhuang · 8dc576d5
  David黄金龙 authored Feb 01, 2024
```
* commit '3257c54a':
  解决冲突
  主申请人 获取信息接口
```
  8dc576d5
- 服务中心首页展示 · aa84852a
  David黄金龙 authored Feb 01, 2024
  
  aa84852a
- 解决冲突 · 3257c54a
  pete谢兆麟 authored Feb 01, 2024
  
  3257c54a
- Merge branch 'develop' into xiezhaolin · 8b4f664e
  pete谢兆麟 authored Feb 01, 2024
```
# Conflicts:
#	galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
```
  8b4f664e