Commits · 7e5c54b92b8997eb8df43534eb104274a2d0ef13 · mobile-group / galaxy-iOS

22 Dec, 2023 1 commit
- // add: 桥接文件 · 7e5c54b9
  Steven杜宇 authored Dec 22, 2023
  
  7e5c54b9
21 Dec, 2023 3 commits
- 处理一处警告 · 7aaecd26
  David黄金龙 authored Dec 21, 2023
  
  7aaecd26
- 删除不使用的代码 · 3aeac477
  David黄金龙 authored Dec 21, 2023
  
  3aeac477
- 删除不使用的文件 · 5b930306
  David黄金龙 authored Dec 21, 2023
  
  5b930306
20 Dec, 2023 29 commits
- 文件夹移动 · 79457af8
  David黄金龙 authored Dec 20, 2023
  
  79457af8
- 文件移动 · c998c271
  David黄金龙 authored Dec 20, 2023
  
  c998c271
- 文件夹移动 · aa9bb71a
  David黄金龙 authored Dec 20, 2023
  
  aa9bb71a
- 文件移动 · 0b841956
  David黄金龙 authored Dec 20, 2023
  
  0b841956
- 处理 UI 基础框架 · 277f5d93
  David黄金龙 authored Dec 20, 2023
  
  277f5d93
- 删除不使用的文件 · e54953ea
  David黄金龙 authored Dec 20, 2023
  
  e54953ea
- 添加上拉刷新和下拉刷新 · 41daccb1
  David黄金龙 authored Dec 20, 2023
  
  41daccb1
- 编译警告消除 · e1ee1724
  pete谢兆麟 authored Dec 20, 2023
  
  e1ee1724
- Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop · cec3ca9c
  David黄金龙 authored Dec 20, 2023
  
  cec3ca9c
- 添加 SwifterSwift 扩展 · 895d22a8
  David黄金龙 authored Dec 20, 2023
  
  895d22a8
- // 我的模块 · 388d859b
  Steven杜宇 authored Dec 20, 2023
  
  388d859b
- 网络请求封装 · d9dd634a
  pete谢兆麟 authored Dec 20, 2023
  
  d9dd634a
- Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop · 5af4853a
  David黄金龙 authored Dec 20, 2023
  
  5af4853a
- 处理一处警告 · a8017e1a
  David黄金龙 authored Dec 20, 2023
  
  a8017e1a
- // gitignore · fb5931b9
  Steven杜宇 authored Dec 20, 2023
  
  fb5931b9
- 处理冲突 · c38172d7
  David黄金龙 authored Dec 20, 2023
  
  c38172d7
- 基本项目框架 · b9ee7076
  pete谢兆麟 authored Dec 20, 2023
  
  b9ee7076
- 增加注释 · 4ea4bd6b
  David黄金龙 authored Dec 20, 2023
  
  4ea4bd6b
- 处理 pod的警告 · c8ff4442
  David黄金龙 authored Dec 20, 2023
  
  c8ff4442
- Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop · ec5eaf03
  David黄金龙 authored Dec 20, 2023
```
# Conflicts:
#	galaxy/Podfile

处理冲突
```
  ec5eaf03
- 添加忽略文件 · 2fae0d30
  David黄金龙 authored Dec 20, 2023
```
添加依赖库
```
  2fae0d30
- podfile 修改 · 0b3fe85e
  pete谢兆麟 authored Dec 20, 2023
  
  0b3fe85e
- Merge commit '384b3036 ' into davidhuang · 38bbc048
  David黄金龙 authored Dec 20, 2023
  
  38bbc048
- 删除不需要跟踪的文件 · 62f90b99
  David黄金龙 authored Dec 20, 2023
  
  62f90b99
- // delete pods · 384b3036
  Steven杜宇 authored Dec 20, 2023
  
  384b3036
- 1 · 1eac36ca
  David黄金龙 authored Dec 20, 2023
  
  1eac36ca
- no message · 02ad963a
  David黄金龙 authored Dec 20, 2023
  
  02ad963a
- 修改忽略文件位置 · 52cc3eca
  David黄金龙 authored Dec 20, 2023
  
  52cc3eca
- test · 95f9cd95
  David黄金龙 authored Dec 20, 2023
  
  95f9cd95
19 Dec, 2023 7 commits
- no message · 8bec8b71
  David黄金龙 authored Dec 19, 2023
  
  8bec8b71
- Merge branch 'davidhuang' into develop · e43c2413
  David黄金龙 authored Dec 19, 2023
  
  e43c2413
- 添加pod 文件 · 0fc671f8
  David黄金龙 authored Dec 19, 2023
  
  0fc671f8
- 1、添加忽略文件 · 1cd48f61
  David黄金龙 authored Dec 19, 2023
```
2、添加网络监控第三方模块
```
  1cd48f61
- 123 · 1f37867a
  pete谢兆麟 authored Dec 19, 2023
  
  1f37867a
- Merge branch 'davidhuang' into develop · b8aa0547
  David黄金龙 authored Dec 19, 2023
  
  b8aa0547
- Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop · b65a4058
  Steven杜宇 authored Dec 19, 2023
```
# Conflicts:
#	test.txt
```
  b65a4058