Commits · 62e6aa3eced00f46cbca519256f4c125edcea629 · xushaohua / midjourney-proxy

18 Oct, 2019 6 commits
- Merge branch 'fixbug-1015367' into 'master' · 62e6aa3e
```
'导出授权码去掉授权码字段'

See merge request rays/pcloud-book!202
```
  高鹏 authored Oct 18, 2019
  62e6aa3e Browse Files
- '导出授权码去掉授权码字段' · a2a126b8
  lihao authored Oct 18, 2019
  
  a2a126b8 Browse Files
- Merge branch 'feat-zyq-1001743' into 'master' · 4c915644
```
1001743-增加早晚报推送规则

See merge request rays/pcloud-book!201
```
  高鹏 authored Oct 18, 2019
  4c915644 Browse Files
- Merge branch 'master' of http://begitlab.chubanyun.me/rays/pcloud-book into feat-zyq-1001743 · c71de252
  郑永强 authored Oct 18, 2019
  
  c71de252 Browse Files
- Merge branch 'zyj-duration' into 'master' · 3419f6da
```
音频时长精度

See merge request rays/pcloud-book!200
```
  高鹏 authored Oct 18, 2019
  3419f6da Browse Files
- 音频时长精度 · d0ba92a6
  朱亚洁 authored Oct 18, 2019
  
  d0ba92a6 Browse Files
17 Oct, 2019 3 commits
- Merge branch 'feat-1001847' into 'master' · 49799711
```
【ID1001847】1v1模式和普通群模式tab分开

See merge request rays/pcloud-book!199
```
  高鹏 authored Oct 17, 2019
  49799711 Browse Files
- Merge branch 'master' into feat-1001847 · 52240603
  阮思源 authored Oct 17, 2019
  
  52240603 Browse Files
- Merge branch 'feat-rsy' into 'master' · 54ae084e
```
修改bug1015443

See merge request rays/pcloud-book!198
```
  高鹏 authored Oct 17, 2019
  54ae084e Browse Files
16 Oct, 2019 7 commits
- 修改bug1015443 · 694ea37a
  阮思源 authored Oct 16, 2019
  
  694ea37a Browse Files
- Merge branch 'addService' into 'master' · 56cafe61
```
add service for update qr

See merge request rays/pcloud-book!197
```
  裴大威 authored Oct 16, 2019
  56cafe61 Browse Files
- 增加排序 · 8e8c5706
  郑永强 authored Oct 16, 2019
  
  8e8c5706 Browse Files
- 修改建社群码逻辑 · 24a29190
  阮思源 authored Oct 16, 2019
  
  24a29190 Browse Files
- add service for update qr · bcf4a4e3
  zhangchunyu authored Oct 16, 2019
  
  bcf4a4e3 Browse Files
- 修正筛选条件 · 00701663
  郑永强 authored Oct 16, 2019
  
  00701663 Browse Files
- 修改排序 · e2fcb182
  郑永强 authored Oct 16, 2019
  
  e2fcb182 Browse Files
14 Oct, 2019 11 commits
- 加入判断规则 · c655b088
  郑永强 authored Oct 14, 2019
  
  c655b088 Browse Files
- 解决深度复制bug · a1995685
  郑永强 authored Oct 14, 2019
  
  a1995685 Browse Files
- 加按照进群类型搜索条件 · 3916e8b4
  阮思源 authored Oct 14, 2019
  
  3916e8b4 Browse Files
- Merge branch 'feat-1001733' into 'master' · 05e9b211
```
修改截取

See merge request rays/pcloud-book!196
```
  高鹏 authored Oct 14, 2019
  05e9b211 Browse Files
- Merge branch 'fix-1014786' into 'master' · cf589c15
```
修改出版端获取书总数接口

See merge request rays/pcloud-book!195
```
  高鹏 authored Oct 14, 2019
  cf589c15 Browse Files
- 修改出版端获取书总数接口 · 6f383772
  zhangdongwei-intern authored Oct 08, 2019
  
  6f383772 Browse Files
- 修改截取 · 058a597e
  阮思源 authored Oct 14, 2019
  
  058a597e Browse Files
- Merge branch 'feat-1001733' into 'master' · d786c024
```
修改截取规则

See merge request rays/pcloud-book!194
```
  高鹏 authored Oct 14, 2019
  d786c024 Browse Files
- 修改截取规则 · 6e6ebce5
  阮思源 authored Oct 14, 2019
  
  6e6ebce5 Browse Files
- Merge branch 'fix-zyq-1014150' into feat-zyq-1001743 · aaca0108
```
# Conflicts:
#	pcloud-service-book/src/main/java/com/pcloud/book/adnews/biz/impl/AdNewsBizImpl.java
```
  郑永强 authored Oct 14, 2019
  aaca0108 Browse Files
- Merge branch 'fix-zyq-1014150' into feat-zyq-1001743 · fea41be5
```
# Conflicts:
#	pcloud-service-book/src/main/java/com/pcloud/book/adnews/biz/impl/AdNewsBizImpl.java
```
  郑永强 authored Oct 14, 2019
  fea41be5 Browse Files
12 Oct, 2019 2 commits
- Merge branch 'feature-lz-1001822' into 'master' · 4d78f867
```
修改欢迎语

See merge request rays/pcloud-book!193
```
  裴大威 authored Oct 12, 2019
  4d78f867 Browse Files
- 修改欢迎语 · 0a0994b8
  刘正 authored Oct 12, 2019
  
  0a0994b8 Browse Files
11 Oct, 2019 2 commits
- 增加早晚报推送规则逻辑 · b9300210
  郑永强 authored Oct 11, 2019
  
  b9300210 Browse Files
- fix bug · 34cdabdb
  郑永强 authored Oct 11, 2019
  
  34cdabdb Browse Files
10 Oct, 2019 9 commits
- Merge branch 'feat-1001733' into 'master' · f0680452
```
处理旧数据更新暗号

See merge request rays/pcloud-book!192
```
  高鹏 authored Oct 10, 2019
  f0680452 Browse Files
- 处理旧数据更新暗号 · fa591d7d
  阮思源 authored Oct 10, 2019
  
  fa591d7d Browse Files
- Merge branch 'feat-1001792new' into 'master' · ba1d6208
```
C1001792

See merge request rays/pcloud-book!191
```
  高鹏 authored Oct 10, 2019
  ba1d6208 Browse Files
- C1001792 · 20244c03
  阮思源 authored Oct 10, 2019
  
  20244c03 Browse Files
- Merge branch 'feat-1001733' into 'master' · ec726553
```
1001733修改下处理旧数据的sql

See merge request rays/pcloud-book!190
```
  高鹏 authored Oct 10, 2019
  ec726553 Browse Files
- 修改下sql · 18ba902b
  阮思源 authored Oct 10, 2019
  
  18ba902b Browse Files
- Merge branch 'feat-1001733' into 'master' · ae0e84fb
```
10017331V1入群优化

See merge request rays/pcloud-book!189
```
  高鹏 authored Oct 10, 2019
  ae0e84fb Browse Files
- 解决冲突 · db50015f
  阮思源 authored Oct 10, 2019
  
  db50015f Browse Files
- fix · 4959831b
  阮思源 authored Oct 10, 2019
  
  4959831b Browse Files