Commits · 2d800acafb58ece204ba1283f288adb383c162f1 · qzhxx / national_museum_vod

07 Apr, 2021 11 commits
- Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod · 2d800aca
  乐宝呗666 authored Apr 07, 2021
  
  2d800aca
- Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod · 5a84342c
  xulili authored Apr 07, 2021
  
  5a84342c
- 省市区请求添加token · 5495fbd7
  乐宝呗666 authored Apr 07, 2021
  
  5495fbd7
- 修改密码改变参数 · ffa57c51
  xulili authored Apr 07, 2021
  
  ffa57c51
- Merge branch 'master' into dev_fbl · 6a6224b6
  乐宝呗666 authored Apr 07, 2021
  
  6a6224b6
- 改用统一分页组件 · 43510351
  乐宝呗666 authored Apr 07, 2021
  
  43510351
- Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod into dev_xll · f6166f66
  xulili authored Apr 07, 2021
  
  f6166f66
- 修改部分样式 · 9ee3e7c7
  xulili authored Apr 07, 2021
  
  9ee3e7c7
- bug fixed · 4c96e116
  liqin authored Apr 07, 2021
  
  4c96e116
- bug fixed · 72f51c80
  liqin authored Apr 07, 2021
  
  72f51c80
- bug fixed · c12d6500
  liqin authored Apr 07, 2021
  
  c12d6500
06 Apr, 2021 9 commits
- 合并 · d32942a2
  qzhxx authored Apr 06, 2021
  
  d32942a2
- 详情 · b61ccdaf
  qzhxx authored Apr 06, 2021
  
  b61ccdaf
- Merge branch 'master' into dev_fbl · a046937f
  乐宝呗666 authored Apr 06, 2021
  
  a046937f
- 添加展板视频详情功能 · b6d5cfd9
  乐宝呗666 authored Apr 06, 2021
  
  b6d5cfd9
- conflict resolve · 0fb54293
  xulili authored Apr 06, 2021
  
  0fb54293
- Merge branch 'dev_xll' into 'master' · 9f58a0a5
  xulili authored Apr 06, 2021
```
Dev xll

See merge request !17
```
  9f58a0a5
- 统计导出pdf · 097174d2
  xulili authored Apr 06, 2021
  
  097174d2
- bug fixed · a0ff0c1c
  liqin authored Apr 06, 2021
  
  a0ff0c1c
- bug fixed · 695faa29
  liqin authored Apr 06, 2021
  
  695faa29
02 Apr, 2021 14 commits
- dddd · 8e6d2746
  liqin authored Apr 02, 2021
  
  8e6d2746
- dddd · 7591c7b0
  liqin authored Apr 02, 2021
  
  7591c7b0
- Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod · abbe946c
  qzhxx authored Apr 02, 2021
  
  abbe946c
- 合并 · 695db2cb
  qzhxx authored Apr 02, 2021
  
  695db2cb
- 更换视频上传路径 · a2e43fe6
  qzhxx authored Apr 02, 2021
  
  a2e43fe6
- 更换文件上传接口 · 9a3ce287
  qzhxx authored Apr 02, 2021
  
  9a3ce287
- Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod into dev_xll · b3b74477
  xulili authored Apr 02, 2021
  
  b3b74477
- 统计 · 104ecfa8
  xulili authored Apr 02, 2021
  
  104ecfa8
- Merge branch 'master' into dev_fbl · bdaa5854
  乐宝呗666 authored Apr 02, 2021
  
  bdaa5854
- 修改样式 · c802945e
  乐宝呗666 authored Apr 02, 2021
  
  c802945e
- Merge branch 'dev_xll' into 'master' · 597720eb
  xulili authored Apr 02, 2021
```
Dev xll

See merge request !16
```
  597720eb
- 参数调整 · 9cab4646
  qzhxx authored Apr 02, 2021
  
  9cab4646
- merge · db851fd3
  qzhxx authored Apr 02, 2021
  
  db851fd3
- 审核 · 44d2d2f5
  qzhxx authored Apr 02, 2021
  
  44d2d2f5
01 Apr, 2021 5 commits
- 修改页面说明内容 · 835fb5ba
  乐宝呗666 authored Apr 01, 2021
  
  835fb5ba
- Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod into dev_xll · e8d06349
  xulili authored Apr 01, 2021
  
  e8d06349
- 登录 · 246ba8e1
  xulili authored Apr 01, 2021
  
  246ba8e1
- Merge branch 'dev_xll' into 'master' · 0a2ee8ea
  xulili authored Apr 01, 2021
```
Dev xll

See merge request !15
```
  0a2ee8ea
- 修改bug · 76f2cdad
  乐宝呗666 authored Apr 01, 2021
  
  76f2cdad
31 Mar, 2021 1 commit
- Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod into dev_xll · 3cb268bd
  xulili authored Mar 31, 2021
  
  3cb268bd