Commits · 1482b4fcb12d9d4ab231e74573de9d51200cf64d · licc / data-server

05 Mar, 2021 24 commits
- bug fixed · 1482b4fc
  liqin authored Mar 05, 2021
  
  1482b4fc
- bug fixed · d4467401
  liqin authored Mar 05, 2021
  
  d4467401
- bug fixed · b02c731a
  liqin authored Mar 05, 2021
  
  b02c731a
- bug fixed · 4547edfd
  liqin authored Mar 05, 2021
  
  4547edfd
- bug fixed · 8a019202
  liqin authored Mar 05, 2021
  
  8a019202
- bug fixed · 1f4a3ca1
  liqin authored Mar 05, 2021
  
  1f4a3ca1
- bug fixed · 8d57a51e
  liqin authored Mar 05, 2021
  
  8d57a51e
- bug fixed · 7dea81ee
  liqin authored Mar 05, 2021
  
  7dea81ee
- bug fixed · d0164007
  liqin authored Mar 05, 2021
  
  d0164007
- bug fixed · 7a511ba6
  liqin authored Mar 05, 2021
  
  7a511ba6
- bug fixed · 8f785a7e
  liqin authored Mar 05, 2021
  
  8f785a7e
- bug fixed · 62a24d7e
  liqin authored Mar 05, 2021
  
  62a24d7e
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · 310d2c7f
  liqin authored Mar 05, 2021
  
  310d2c7f
- bug fixed · ff5ea0c9
  liqin authored Mar 05, 2021
  
  ff5ea0c9
- Merge remote-tracking branch 'origin/master' · 1b7104cc
  m1991 authored Mar 05, 2021
  
  1b7104cc
- bug fixed · 90a898c9
  liqin authored Mar 05, 2021
  
  90a898c9
- 资讯模块-数据展示接口 · 008e8e12
  m1991 authored Mar 05, 2021
```
注册功能完善
```
  008e8e12
- bug fixed · 84ad044a
  liqin authored Mar 05, 2021
  
  84ad044a
- bug fixed · 45ab41f2
  liqin authored Mar 05, 2021
  
  45ab41f2
- bug fixed · 80e53610
  liqin authored Mar 05, 2021
  
  80e53610
- bug fixed · cdbb3a3a
  liqin authored Mar 05, 2021
  
  cdbb3a3a
- bug fixed · eb368a89
  liqin authored Mar 05, 2021
  
  eb368a89
- bug fixed · 475781d8
  liqin authored Mar 05, 2021
  
  475781d8
- bug fixed · 57937182
  liqin authored Mar 05, 2021
  
  57937182
04 Mar, 2021 16 commits
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · a1383193
  liqin authored Mar 04, 2021
  
  a1383193
- bug fixed · 80f93643
  liqin authored Mar 04, 2021
  
  80f93643
- Merge remote-tracking branch 'origin/master' · c2d734ca
  licc authored Mar 04, 2021
  
  c2d734ca
- 提现接口实现 · b93b9eca
  licc authored Mar 04, 2021
  
  b93b9eca
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · bfd921ab
  liqin authored Mar 04, 2021
  
  bfd921ab
- bug fixed · 2175fbbb
  liqin authored Mar 04, 2021
  
  2175fbbb
- 森林状态功能实现 · a53b1cc3
  codezwjava authored Mar 04, 2021
  
  a53b1cc3
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · b9c9690d
  liqin authored Mar 04, 2021
```
 Conflicts:
	wisenergy-web-admin/src/main/resources/application-test.yml
```
  b9c9690d
- bug fixed · f070910b
  liqin authored Mar 04, 2021
  
  f070910b
- 部署 · c07bae07
  licc authored Mar 04, 2021
  
  c07bae07
- 解决启动报错 · 34ad5d18
  m1991 authored Mar 04, 2021
  
  34ad5d18
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · 466add35
  liqin authored Mar 04, 2021
```
 Conflicts:
	wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
	wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
	wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
	wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/loginController.java
```
  466add35
- bug fixed · 980d15e3
  liqin authored Mar 04, 2021
  
  980d15e3
- sms工具类迁移用户注册功能接口实现 · 4272103d
  m1991 authored Mar 04, 2021
  
  4272103d
- sms工具类迁移用户注册功能接口实现 · aad3d84c
  m1991 authored Mar 04, 2021
  
  aad3d84c
- sms工具类迁移用户注册功能接口实现 · e647e7a8
  m1991 authored Mar 04, 2021
  
  e647e7a8