Commits · 101ca0cfd93d9a56e4b5cdf338cd79d18b28f427 · xushaohua / midjourney-proxy

02 Sep, 2019 9 commits
- 合并 · 101ca0cf
  朱亚洁 authored Sep 02, 2019
  
  101ca0cf Browse Files
- 合并 · 6b9bb4af
  朱亚洁 authored Sep 02, 2019
  
  6b9bb4af Browse Files
- 广告主打标 · 47f5ea56
  朱亚洁 authored Sep 02, 2019
  
  47f5ea56 Browse Files
- Merge branch 'feat-zyjmaster' into 'master' · f4259b6f
```
pc端小需求

See merge request rays/pcloud-book!119
```
  高鹏 authored Sep 02, 2019
  f4259b6f Browse Files
- Merge branch 'master' into 'feat-zyjmaster' · b2bb411c
```
# Conflicts:
#   pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java
```
  高鹏 authored Sep 02, 2019
  b2bb411c Browse Files
- pc端小需求 · 6bec7976
  朱亚洁 authored Sep 02, 2019
  
  6bec7976 Browse Files
- Merge branch 'ruansiyuan' into 'master' · 6b6aada0
```
群发做1s延时，改为异步

See merge request rays/pcloud-book!118
```
  高鹏 authored Sep 02, 2019
  6b6aada0 Browse Files
- 群发的地方设置为异步并延时1s · 3da09d71
  阮思源 authored Sep 02, 2019
  
  3da09d71 Browse Files
- Merge branch 'master' of http://begitlab.chubanyun.me/rays/pcloud-book into ruansiyuan · b710ea5c
  阮思源 authored Sep 02, 2019
  
  b710ea5c Browse Files
30 Aug, 2019 3 commits
- Merge branch 'zhengyongqiang' into 'master' · 29091089
```
Zhengyongqiang

See merge request rays/pcloud-book!117
```
  高鹏 authored Aug 30, 2019
  29091089 Browse Files
- Merge branch 'master' into zhengyongqiang · 3d73fa9d
  郑永强 authored Aug 30, 2019
  
  3d73fa9d Browse Files
- Merge branch 'hotfix-dw-wxgroup' into 'master' · 9d807954
```
fix 更新群人数

See merge request rays/pcloud-book!116
```
  裴大威 authored Aug 30, 2019
  9d807954 Browse Files
29 Aug, 2019 3 commits
- fix 更新群人数 · e9208f81
  裴大威 authored Aug 29, 2019
  
  e9208f81 Browse Files
- 去掉延时 · c64bc645
  阮思源 authored Aug 29, 2019
  
  c64bc645 Browse Files
- 群发休眠0.1s · 593ede4c
  阮思源 authored Aug 29, 2019
  
  593ede4c Browse Files
28 Aug, 2019 1 commit
- 解决查询重复记录问题 · 2ce4cc2b
  郑永强 authored Aug 28, 2019
  
  2ce4cc2b Browse Files
27 Aug, 2019 15 commits
- Merge branch 'feat-sycClock' into 'master' · e1126772
```
处理打卡旧数据

See merge request rays/pcloud-book!115
```
  裴大威 authored Aug 27, 2019
  e1126772 Browse Files
- 处理打卡旧数据 · a1dfefbb
  杨涛 authored Aug 27, 2019
  
  a1dfefbb Browse Files
- fix bug · 16c3bf16
  郑永强 authored Aug 27, 2019
  
  16c3bf16 Browse Files
- 修改自有公众号结构 · dedaef33
  郑永强 authored Aug 27, 2019
  
  dedaef33 Browse Files
- 早晚报增加自有公众号 · 983c494b
  郑永强 authored Aug 27, 2019
  
  983c494b Browse Files
- Merge branch 'fix-zdw-1001049' into 'master' · 97402fdb
```
fix-1001049: 出版商城社群书接口500

See merge request rays/pcloud-book!113
```
  裴大威 authored Aug 27, 2019
  97402fdb Browse Files
- 修改 · b890c99d
  zhangdongwei-intern authored Aug 27, 2019
  
  b890c99d Browse Files
- Revert "test" · a528eff8
```
This reverts commit b5ecacd0
```
  裴大威 authored Aug 27, 2019
  a528eff8 Browse Files
- Merge branch 'dx-C1000884' · ff334f69
  daixing authored Aug 27, 2019
  
  ff334f69 Browse Files
- test · b5ecacd0
  daixing authored Aug 27, 2019
  
  b5ecacd0 Browse Files
- Merge branch 'dx-C1000884' into 'master' · 088a7a08
```
收益管理

See merge request rays/pcloud-book!112
```
  裴大威 authored Aug 27, 2019
  088a7a08 Browse Files
- Merge branch 'master' of ssh://begitlab.chubanyun.me:12122/rays/pcloud-book into dx-C1000884 · d3aedd1d
  daixing authored Aug 27, 2019
  
  d3aedd1d Browse Files
- fix · 71c1c16c
  daixing authored Aug 27, 2019
  
  71c1c16c Browse Files
- fix pom version · e2e0c6ee
  裴大威 authored Aug 27, 2019
  
  e2e0c6ee Browse Files
- fix version · 9de4f09b
  裴大威 authored Aug 27, 2019
  
  9de4f09b Browse Files
26 Aug, 2019 9 commits
- 收益管理 · 89d4b009
  daixing authored Aug 26, 2019
  
  89d4b009 Browse Files
- Merge branch 'feat/clock' into 'master' · 496af94c
```
fix import BookProps

See merge request rays/pcloud-book!111
```
  裴大威 authored Aug 26, 2019
  496af94c Browse Files
- fix import BookProps · a19832a3
  杨涛 authored Aug 26, 2019
  
  a19832a3 Browse Files
- Merge branch 'feat/clock' into 'master' · 711b77ee
```
1001437签到打卡关联抽奖与群打卡入口迁移

See merge request rays/pcloud-book!110
```
  裴大威 authored Aug 26, 2019
  711b77ee Browse Files
- fix · 32ff305e
  daixing authored Aug 26, 2019
  
  32ff305e Browse Files
- 修改显示内容 · e392cdcd
  杨涛 authored Aug 26, 2019
  
  e392cdcd Browse Files
- fix 连接重新拼接 · d289f5b9
  杨涛 authored Aug 26, 2019
  
  d289f5b9 Browse Files
- Merge branch 'feat-zyjmaster' into 'master' · f87ce79f
```
基金书筛选包括冻结书

See merge request rays/pcloud-book!109
```
  裴大威 authored Aug 26, 2019
  f87ce79f Browse Files
- 基金书筛选包括冻结书 · 12d46616
  朱亚洁 authored Aug 26, 2019
  
  12d46616 Browse Files