Commits · 39ba0089eda5378e1e6d30c9914605890a0145a0 · Administrator / browser-backend

29 Sep, 2020 3 commits
- Merge branch 'fix-hotbugs' into 'master' · 39ba0089
  Administrator authored Sep 29, 2020
```
Fix hotbugs

See merge request !183
```
  39ba0089
- 管理员界面-推广码下线查询 bug修復 · 2301d3f9
  xuxin authored Sep 29, 2020
  
  2301d3f9
- Merge remote-tracking branch 'origin/master' · 93583854
  xuxin authored Sep 29, 2020
  
  93583854
27 Sep, 2020 7 commits
- Merge branch 'staging' into 'master' · ebab4176
  Administrator authored Sep 27, 2020
```
Staging

See merge request !182
```
  ebab4176
- Merge remote-tracking branch 'origin/staging' into staging · ac24883a
  xuxin authored Sep 27, 2020
  
  ac24883a
- vps分配bug修复 · 14a2b1ad
  xuxin authored Sep 27, 2020
  
  14a2b1ad
- Merge branch 'staging' into 'master' · 66ac6c01
  Administrator authored Sep 27, 2020
```
Staging

See merge request !181
```
  66ac6c01
- KCP端口号默认值设为"" · 750a3522
  huangjiamin authored Sep 27, 2020
  
  750a3522
- Merge remote-tracking branch 'origin/staging' into staging · 153dfc20
  xuxin authored Sep 27, 2020
  
  153dfc20
- vps分配bug修复 · d538179e
  xuxin authored Sep 27, 2020
  
  d538179e
25 Sep, 2020 8 commits
- Merge branch 'staging' into 'master' · 596a1911
  Administrator authored Sep 25, 2020
```
fix uk issue

See merge request !180
```
  596a1911
- fix uk issue · c9b120a4
  Qingsong Li authored Sep 25, 2020
  
  c9b120a4
- Merge branch 'staging' into 'master' · 88973940
  Administrator authored Sep 25, 2020
```
Staging

See merge request !179
```
  88973940
- rdp文件改回原来的 · b5409c9a
  xuxin authored Sep 25, 2020
  
  b5409c9a
- 修改用户使用赠送的16元的支付方式 · ba666a93
  xuxin authored Sep 25, 2020
  
  ba666a93
- vps相关修改 · b9eb3cb1
  xuxin authored Sep 25, 2020
  
  b9eb3cb1
- shopUA相关修改 · 76110c26
  xuxin authored Sep 25, 2020
  
  76110c26
- 用户打开店铺记录在保存记录的同时删除过期的记录修改为只保留一天的记录 · 0cf647dd
  xuxin authored Sep 25, 2020
  
  0cf647dd
24 Sep, 2020 1 commit
- Merge remote-tracking branch 'origin/staging' into staging · d9a0595d
  xuxin authored Sep 24, 2020
  
  d9a0595d
23 Sep, 2020 1 commit
- 用户白名单、KCP端口号 · b2a47f58
  huangjiamin authored Sep 23, 2020
  
  b2a47f58
22 Sep, 2020 2 commits
- 用户打开店铺记录在保存记录的同时删除过期的记录 · 5dc5a98e
  xuxin authored Sep 22, 2020
  
  5dc5a98e
- 用户打开店铺记录在保存记录的同时删除过期的记录 · 4f14c5ed
  xuxin authored Sep 22, 2020
  
  4f14c5ed
19 Sep, 2020 14 commits
- Merge branch 'staging' into 'master' · 6c09e200
  Administrator authored Sep 19, 2020
```
Staging

See merge request !178
```
  6c09e200
- 收藏夹相关接口修改传参 · d3b6e6d7
  xuxinpc authored Sep 19, 2020
  
  d3b6e6d7
- 收藏夹相关接口修改传参 · cde32e8d
  xuxinpc authored Sep 19, 2020
  
  cde32e8d
- 收藏夹相关接口修改传参 · 8b847be9
  xuxinpc authored Sep 19, 2020
  
  8b847be9
- Merge branch 'staging' into 'master' · a575b78a
  Administrator authored Sep 19, 2020
```
Staging

See merge request !177
```
  a575b78a
- 收藏夹相关接口修改传参方式 · 1942954b
  xuxinpc authored Sep 19, 2020
  
  1942954b
- 打印日志 · e28febaf
  xuxinpc authored Sep 19, 2020
  
  e28febaf
- 收藏夹相关接口修改传参方式 · 1c4f20f3
  xuxinpc authored Sep 19, 2020
  
  1c4f20f3
- 收藏夹相关接口修改传参方式 · 27819849
  xuxinpc authored Sep 19, 2020
  
  27819849
- 收藏夹相关接口移除校验 · 1eb91b38
  xuxinpc authored Sep 19, 2020
  
  1eb91b38
- 收藏夹相关接口移除校验 · da7dcd0c
  xuxinpc authored Sep 19, 2020
  
  da7dcd0c
- 将收藏夹相关接口移动到 tempController · 5d86aa5a
  xuxinpc authored Sep 19, 2020
  
  5d86aa5a
- Merge branch 'staging' of http://120.77.149.83/root/browser-backend into staging · 64f719e5
  xuxinpc authored Sep 19, 2020
```
"home"
```
  64f719e5
- 店铺收藏夹功能 · 70e2b755
  xuxin authored Sep 19, 2020
  
  70e2b755
18 Sep, 2020 4 commits
- Merge branch 'staging' into 'master' · 81f09f4f
  Administrator authored Sep 18, 2020
```
提供前端查询ip 浏览器显示换行

See merge request !176
```
  81f09f4f
- 提供前端查询ip 浏览器显示换行 · 9f8dca7f
  xuxin authored Sep 18, 2020
  
  9f8dca7f
- Merge branch 'staging' into 'master' · 9f29cab4
  Administrator authored Sep 18, 2020
```
管理员界面-推广码下线查询 性能优化

See merge request !175
```
  9f29cab4
- 管理员界面-推广码下线查询性能优化 · 59c9cae9
  xuxin authored Sep 18, 2020
  
  59c9cae9