Commits · c5a5fef0549d1171feb18f767384f1ab11ef1795 · gengmeiios / GMBase

19 Jun, 2020 2 commits
- Merge branch 'master' into zl_base · c5a5fef0
  周亮 authored Jun 19, 2020
```
* master:
  Bump version to 1.1.8
```
  c5a5fef0
- 修改回到前台is_first为1的bug，应该为0 · 6d5bc870
  周亮 authored Jun 19, 2020
  
  6d5bc870
18 Jun, 2020 4 commits
- 暂提 · 31450951
  周亮 authored Jun 18, 2020
  
  31450951
- Bump version to 1.1.8 · 50484bd1
  gm-mini authored Jun 18, 2020
  
  50484bd1
- Merge branch 'zl_base' into 'master' · b36f422f
  乔金柱 authored Jun 18, 2020
```
暂提

See merge request !23
```
  b36f422f
- 暂提 · e7ca369f
  周亮 authored Jun 18, 2020
  
  e7ca369f
15 Jun, 2020 3 commits
- Bump version to 1.1.7 · 490f7b3a
  gm-mini authored Jun 15, 2020
  
  490f7b3a
- update · d2b5bc69
  gm-mini authored Jun 15, 2020
  
  d2b5bc69
- Merge branch 'lym/text1' into 'master' · 816a6dd9
  乔金柱 authored Jun 15, 2020
```
Lym/text1

See merge request !22
```
  816a6dd9
12 Jun, 2020 1 commit
- 更新库 · 0270df78
  yueming lu authored Jun 12, 2020
  
  0270df78
26 May, 2020 2 commits
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · decc7f24
  luyueming authored May 26, 2020
```
* 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase:
  update
```
  decc7f24
- 修改获取当前控制器 · 207e661f
  luyueming authored May 26, 2020
  
  207e661f
25 May, 2020 1 commit
- update · d3941abe
  jz authored May 25, 2020
  
  d3941abe
20 May, 2020 2 commits
- Merge branch 'master' into lym/text · 8cd23190
  jz authored May 20, 2020
  
  8cd23190
- update · c2cf29a6
  jz authored May 20, 2020
  
  c2cf29a6
19 May, 2020 1 commit
- update · dabdfbed
  jz authored May 19, 2020
  
  dabdfbed
18 May, 2020 1 commit
- Merge branch 'lym/text' into 'master' · 3b6941d8
  乔金柱 authored May 18, 2020
```
Lym/text

See merge request !21
```
  3b6941d8
14 May, 2020 9 commits
- update · 9e91ae10
  jz authored May 14, 2020
  
  9e91ae10
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · b3afead9
  jz authored May 14, 2020
  
  b3afead9
- 迁移一部分到 swift · 4331e9c4
  jz authored May 14, 2020
  
  4331e9c4
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · be17cfd6
  luyueming authored May 14, 2020
```
* 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase:
  update
  update
  update
```
  be17cfd6
- 需改路径 · 770da005
  luyueming authored May 14, 2020
  
  770da005
- update · f3b40c71
  jz authored May 14, 2020
  
  f3b40c71
- update · 72822fd7
  jz authored May 14, 2020
  
  72822fd7
- update · c638d01e
  jz authored May 14, 2020
  
  c638d01e
- update · d40a6af1
  jz authored May 14, 2020
  
  d40a6af1
13 May, 2020 8 commits
- update · 77e6500d
  jz authored May 13, 2020
  
  77e6500d
- add GMBase/Classes/AddClass/GMCalendarEventManager.swift · 38d291a0
  jz authored May 13, 2020
  
  38d291a0
- update · 6fdd4ef1
  jz authored May 13, 2020
  
  6fdd4ef1
- add GMAddressManager · f785f339
  jz authored May 13, 2020
  
  f785f339
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · bb73c1bb
  luyueming authored May 13, 2020
```
* 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase:
  update
```
  bb73c1bb
- 添加的文件 · 54dcbd9d
  luyueming authored May 13, 2020
  
  54dcbd9d
- update · 93d00cad
  jz authored May 13, 2020
  
  93d00cad
- update · 9b7d1d72
  jz authored May 13, 2020
  
  9b7d1d72
12 May, 2020 6 commits
- update · 4d540877
  jz authored May 12, 2020
  
  4d540877
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · 7cbea0cd
  luyueming authored May 12, 2020
```
* 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase:
  update

# Conflicts:
#	GMBase.podspec
chongtu
```
  7cbea0cd
- 无效的文件 · f18657e1
  luyueming authored May 12, 2020
  
  f18657e1
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · aedadf30
  luyueming authored May 12, 2020
```
# Conflicts:
#	GMBase.podspec
冲突
```
  aedadf30
- update · dd7e2e33
  jz authored May 12, 2020
  
  dd7e2e33
- update · 75e54603
  luyueming authored May 12, 2020
  
  75e54603