Commits · 9308c8eff853a92ba0c8bf8f88fced5ad742795b · liqin / chnmuseum-party

23 Apr, 2021 6 commits
- Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party into dev · 9308c8ef
  liqin authored Apr 23, 2021
  
  9308c8ef
- bug fixed · 849abb9c
  liqin authored Apr 23, 2021
  
  849abb9c
- bug fixed · f7d53dcb
  liqin authored Apr 23, 2021
  
  f7d53dcb
- 提交修改 mac 地址格式校验 · 3461eec3
  jiawei authored Apr 23, 2021
  
  3461eec3
- bug fixed · 13a3dcb0
  liqin authored Apr 23, 2021
  
  13a3dcb0
- bug fixed · 8d1ae33e
  liqin authored Apr 23, 2021
  
  8d1ae33e
22 Apr, 2021 8 commits
- bug fixed · 0b2b2d63
  liqin authored Apr 22, 2021
  
  0b2b2d63
- bug fixed · f5c2d27d
  liqin authored Apr 22, 2021
  
  f5c2d27d
- bug fixed · 20546aa0
  liqin authored Apr 22, 2021
  
  20546aa0
- bug fixed · a59a8ca0
  liqin authored Apr 22, 2021
  
  a59a8ca0
- bug fixed · 77516475
  liqin authored Apr 22, 2021
  
  77516475
- Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party into dev · 247fbba6
  liqin authored Apr 22, 2021
  
  247fbba6
- bug fixed · 8613ad9d
  liqin authored Apr 22, 2021
  
  8613ad9d
- 要求修改=》播放数据统计，展板点播top 10 删除的展板不展示 · 139d7878
  jiawei authored Apr 22, 2021
  
  139d7878
21 Apr, 2021 1 commit
- bug fixed · a20dd396
  liqin authored Apr 21, 2021
  
  a20dd396
20 Apr, 2021 25 commits
- Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party into dev · e57e0c6f
  liqin authored Apr 20, 2021
  
  e57e0c6f
- bug fixed · 12a2b736
  liqin authored Apr 20, 2021
  
  12a2b736
- Merge remote-tracking branch 'origin/dev' · 46ce6fd1
  jiawei authored Apr 20, 2021
  
  46ce6fd1
- 要求修改=》播放数据统计，展板点播趋势图还原分页查询接口 · 03c4b026
  jiawei authored Apr 20, 2021
  
  03c4b026
- bug fixed · e82d56ae
  liqin authored Apr 20, 2021
  
  e82d56ae
- Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party into dev · 2f9130e1
  liqin authored Apr 20, 2021
  
  2f9130e1
- bug fixed · f5021ab3
  liqin authored Apr 20, 2021
  
  f5021ab3
- Merge remote-tracking branch 'origin/dev' · e5071f2f
  jiawei authored Apr 20, 2021
  
  e5071f2f
- 要求修改=》播放数据统计，展板点播趋势图日期不能超出当前时间 · 6637281c
  jiawei authored Apr 20, 2021
  
  6637281c
- bug fixed · c80fe4fb
  liqin authored Apr 20, 2021
  
  c80fe4fb
- bug fixed · 9aa7cdc2
  liqin authored Apr 20, 2021
  
  9aa7cdc2
- Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party into dev · 4c1da6a9
  liqin authored Apr 20, 2021
  
  4c1da6a9
- bug fixed · a1dfac07
  liqin authored Apr 20, 2021
  
  a1dfac07
- Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party · e9250468
  jiawei authored Apr 20, 2021
  
  e9250468
- 王亭亭要求修改=》播放数据统计，展板点播趋势图去掉数据库查询时的分页查询 · d60896b0
  jiawei authored Apr 20, 2021
  
  d60896b0
- bug fixed · 54bdac3f
  liqin authored Apr 20, 2021
  
  54bdac3f
- Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party · 468a6d44
  jiawei authored Apr 20, 2021
  
  468a6d44
- 王亭亭要求修改=》播放数据统计，展板点播趋势图返回本业每天的播放量，没有默认展示 0 · 19b108be
  jiawei authored Apr 20, 2021
  
  19b108be
- bug fixed · 70fea19a
  liqin authored Apr 20, 2021
  
  70fea19a
- bug fixed · 4cb8afb1
  liqin authored Apr 20, 2021
  
  4cb8afb1
- bug fixed · f4dd55f6
  liqin authored Apr 20, 2021
  
  f4dd55f6
- bug fixed · a5991b89
  liqin authored Apr 20, 2021
  
  a5991b89
- Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party · 24a2e459
  jiawei authored Apr 20, 2021
  
  24a2e459
- bug fixed · 40c60848
  liqin authored Apr 20, 2021
  
  40c60848
- Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party · 8d041768
  jiawei authored Apr 20, 2021
```
 Conflicts:
	src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentCatController.java
```
  8d041768