Commits · f307c01ecec4dc592a7c02c0b8deff5799a4a83b · licc / shop-Mall

09 Mar, 2021 6 commits
- bug fixed · f307c01e
  liqin authored Mar 09, 2021
  
  f307c01e
- bug fixed · b0a4039e
  liqin authored Mar 09, 2021
  
  b0a4039e
- 资讯模块数据——展示功能实现 · c88ee674
  m1991 authored Mar 09, 2021
  
  c88ee674
- Merge remote-tracking branch 'origin/master' · 217533a1
  m1991 authored Mar 09, 2021
  
  217533a1
- 资讯模块数据——展示功能实现 · 45a8197f
  m1991 authored Mar 09, 2021
  
  45a8197f
- 短信验证码 · 614e4707
  licc authored Mar 09, 2021
  
  614e4707
08 Mar, 2021 32 commits
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · d47124e9
  liqin authored Mar 08, 2021
  
  d47124e9
- bug fixed · 41ed8626
  liqin authored Mar 08, 2021
  
  41ed8626
- 资讯模块数据——展示功能实现 · d3255498
  m1991 authored Mar 08, 2021
  
  d3255498
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · 7c76de52
  liqin authored Mar 08, 2021
  
  7c76de52
- bug fixed · 079a1636
  liqin authored Mar 08, 2021
  
  079a1636
- 自测返佣接口 · c1b0d46c
  licc authored Mar 08, 2021
  
  c1b0d46c
- bug fixed · ff5319fb
  liqin authored Mar 08, 2021
  
  ff5319fb
- bug fixed · 3e41e313
  liqin authored Mar 08, 2021
  
  3e41e313
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · e93888d8
  liqin authored Mar 08, 2021
  
  e93888d8
- bug fixed · 9258ced6
  liqin authored Mar 08, 2021
  
  9258ced6
- Merge remote-tracking branch 'origin/master' · cc1a4120
  m1991 authored Mar 08, 2021
  
  cc1a4120
- 登录功能增加生成唯一标识用于绑定有赞OpengId · 7379f2d1
  m1991 authored Mar 08, 2021
```
修复 前端无法拿到返回值问题
```
  7379f2d1
- bug fixed · baf65df7
  liqin authored Mar 08, 2021
  
  baf65df7
- bug fixed · 7fd98a1d
  liqin authored Mar 08, 2021
  
  7fd98a1d
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · f0496c04
  liqin authored Mar 08, 2021
  
  f0496c04
- bug fixed · a5b1cf41
  liqin authored Mar 08, 2021
  
  a5b1cf41
- 登录功能增加生成唯一标识用于绑定有赞OpengId · 3b192d8c
  m1991 authored Mar 08, 2021
```
修复 前端无法拿到返回值问题
```
  3b192d8c
- 账户表镜像实现 · 3ced1dd8
  licc authored Mar 08, 2021
  
  3ced1dd8
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · 3a0b4d5f
  liqin authored Mar 08, 2021
  
  3a0b4d5f
- bug fixed · bc3c40a1
  liqin authored Mar 08, 2021
  
  bc3c40a1
- Merge remote-tracking branch 'origin/master' · 4a90e740
  licc authored Mar 08, 2021
  
  4a90e740
- 修改sql · 235307d2
  licc authored Mar 08, 2021
  
  235307d2
- bug fixed · 71d94aa2
  liqin authored Mar 08, 2021
  
  71d94aa2
- 设置页面邀请码填写接口提交 · 9c951d26
  licc authored Mar 08, 2021
  
  9c951d26
- 接口调试代码提交2 · 5e85fda9
  licc authored Mar 08, 2021
  
  5e85fda9
- 接口调试代码提交 · 4557d007
  licc authored Mar 08, 2021
  
  4557d007
- Merge remote-tracking branch 'origin/master' · 7ac9fa44
  licc authored Mar 08, 2021
  
  7ac9fa44
- 接口调试代码提交 · 84dc2c63
  licc authored Mar 08, 2021
  
  84dc2c63
- 解决启动报错 · e68a244d
  m1991 authored Mar 08, 2021
  
  e68a244d
- 月度任务接口优化 · 582ff44c
  licc authored Mar 08, 2021
  
  582ff44c
- Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · cd03597d
  liqin authored Mar 08, 2021
  
  cd03597d
- bug fixed · 952f06a4
  liqin authored Mar 08, 2021
  
  952f06a4
07 Mar, 2021 2 commits
- Merge remote-tracking branch 'origin/master' · e9904ab8
  m1991 authored Mar 07, 2021
```
# Conflicts:
#	wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
```
  e9904ab8
- bug fixed · 9f3a3168
  liqin authored Mar 07, 2021
  
  9f3a3168