Commits · d8f59965f2bfd4fdad95ff7f8d8d00eb8d4978b0 · jinli gu / Litemall

22 Nov, 2020 3 commits
- fix[litemall-admin]: gitee #I1X21W · d8f59965
  linlinjava authored Nov 22, 2020
  
  d8f59965
- fix · 7684810b
  linlinjava authored Nov 22, 2020
  
  7684810b
- chore · 79135cc1
  linlinjava authored Nov 22, 2020
  
  79135cc1
01 Nov, 2020 5 commits
- Merge branch 'gouxionglai-master' · 599158a3
  linlinjava authored Nov 01, 2020
  
  599158a3
- chore · f781cdeb
  linlinjava authored Nov 01, 2020
  
  f781cdeb
- Merge branch 'master' of https://github.com/gouxionglai/litemall into gouxionglai-master · 909974d6
  linlinjava authored Nov 01, 2020
  
  909974d6
- chore: druid升级1.2.1 · c4da8fb5
  linlinjava authored Nov 01, 2020
  
  c4da8fb5
- chore: shiro升级版本1.6.0 · aabc2617
  linlinjava authored Nov 01, 2020
  
  aabc2617
28 Oct, 2020 2 commits
- 1.wx：补充售罄的CSS · 40df965c
  gouxionglai authored Oct 28, 2020
  
  40df965c
- 1.admin：去掉规格图片 · 741e1ebb
  gouxionglai authored Oct 28, 2020
```
2.wx：选择不同规格时展示不同图片，默认第一张。
```
  741e1ebb
20 Oct, 2020 1 commit
- Merge pull request #2 from linlinjava/master · 5af77957
  端午安康 authored Oct 20, 2020
```
update
```
  5af77957
28 Sep, 2020 1 commit
- fix · 9cf58564
  linlinjava authored Sep 28, 2020
  
  9cf58564
27 Sep, 2020 1 commit
- !50 fix:售后退款只退一部分会失败的问题 · 04d4fc9c
  linlinjava authored Sep 27, 2020
```
Merge pull request !50 from 宋浩志/N/A
```
  04d4fc9c
26 Sep, 2020 1 commit
- fix:售后退款只退一部分会失败的问题 · 332e9319
  宋浩志 authored Sep 26, 2020
  
  332e9319
21 Aug, 2020 1 commit
- 阿里云发送短信优化，在返回错误后记录日志以及返回发送失败状态 (#429) · 2b69527d
  changyang liu authored Aug 21, 2020
```
Co-authored-by: yang <477915244yang@gmail.com>
```
  2b69527d
04 Aug, 2020 1 commit
- Merge pull request #1 from linlinjava/master · 2f3ef296
  端午安康 authored Aug 04, 2020
```
update
```
  2f3ef296
03 Aug, 2020 1 commit

build(deps): bump elliptic from 6.5.2 to 6.5.3 in /litemall-vue (#422) · 83711ec2

dependabot[bot] authored Aug 03, 2020

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3

)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

83711ec2

31 Jul, 2020 1 commit
- chore: 小程序端取消手机号码校验，后端减弱手机号码校验。 · 749e6ab2
  linlinjava authored Jul 31, 2020
  
  749e6ab2
29 Jul, 2020 1 commit

修改litemall-admin专题topic.vue页面批量删除按钮权限错误 (#421) · 9d5aafff

laiyingzeng authored Jul 29, 2020



* 解决mysql-connector-java为8.0.16时MyBatis Generator无法生成XXXByPrimaryKey相关方法

* 修改litemall-admin专题topic.vue页面批量删除按钮权限错误
Co-authored-by: laiyingzeng <laiyingzeng@gmail.com>

9d5aafff

28 Jul, 2020 1 commit
- serverTimezone=UTC 导致数据库取出来时间早8个小时 (#420) · a54ba213
  lagelanren authored Jul 28, 2020
  
  a54ba213
22 Jul, 2020 1 commit

build(deps): bump lodash from 4.17.15 to 4.17.19 in /litemall-vue (#419) · 8353ed10

dependabot[bot] authored Jul 22, 2020

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19

)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

8353ed10

19 Jul, 2020 1 commit
- 解决mysql-connector-java为8.0.16时MyBatis Generator无法生成XXXByPrimaryKey相关方法 (#418) · 0262f38c
  laiyingzeng authored Jul 19, 2020
```
Co-authored-by: laiyingzeng <laiyingzeng@gmail.com>
```
  0262f38c
18 Jul, 2020 1 commit
- !47 完善会员管理,添加用户id查询和用户编辑 · 199c5600
  linlinjava authored Jul 18, 2020
```
Merge pull request !47 from 滑稽刘/master
```
  199c5600
05 Jul, 2020 2 commits
- chore: 数据库驱动名称更新 · 2365bed6
  linlinjava authored Jul 05, 2020
  
  2365bed6
- 完善会员管理,添加用户id查询和用户编辑 · 8dd7c4bb
  滑稽刘 authored Jul 05, 2020
  
  8dd7c4bb
03 Jul, 2020 4 commits

Merge branch 'master' of https://gitee.com/linlinjava/litemall · c0d5ebc5
Junling Bu authored Jul 03, 2020

c0d5ebc5

build(deps): bump mysql-connector-java from 5.1.46 to 8.0.16 (#410) · fa189cdc

dependabot[bot] authored Jul 03, 2020

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.46 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.46...8.0.16

)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

fa189cdc

build(deps): bump mysql-connector-java in /litemall-db (#411) · 25518ade

dependabot[bot] authored Jul 03, 2020

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.46 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.46...8.0.16

)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

25518ade

!46 限制加入自己开团团购部分加入判空，否则其他用户无法惨团 · d0a5ee23
linlinjava authored Jul 03, 2020
```
Merge pull request !46 from 滑稽刘/master
```
d0a5ee23

02 Jul, 2020 1 commit
- 限制加入自己开团团购部分加入判空，否则用户无法惨团 · 27e6d275
  滑稽刘 authored Jul 02, 2020
  
  27e6d275
29 Jun, 2020 2 commits
- Merge branch 'dev' of https://github.com/linlinjava/litemall · 1a6e2e9a
  Junling Bu authored Jun 29, 2020
  
  1a6e2e9a
- 修复收货地址页面导航栏重复 (#409) · 04c716de
  Batur authored Jun 29, 2020
  
  04c716de
27 Jun, 2020 5 commits
- !44 添加售后详情状态显示，添加订单根据id查询 · eeeaf381
  linlinjava authored Jun 27, 2020
```
Merge pull request !44 from 滑稽刘/master
```
  eeeaf381
- 添加售后详情状态显示，添加订单根据id查询 · 9d2c07a1
  滑稽刘 authored Jun 27, 2020
  
  9d2c07a1
- 添加售后状态显示，添加订单根据id查询 · 7ff311b6
  滑稽刘 authored Jun 27, 2020
  
  7ff311b6
- !42 修复了售后详情无法点击的问题 · ef91b166
  linlinjava authored Jun 27, 2020
```
Merge pull request !42 from 滑稽刘/master
```
  ef91b166
- 修复了售后详情无法点击的问题 · 67ba9dca
  滑稽刘 authored Jun 27, 2020
  
  67ba9dca
26 Jun, 2020 3 commits
- Merge branch 'master' of https://github.com/linlinjava/litemall · 0395ecd3
  Junling Bu authored Jun 26, 2020
  
  0395ecd3
- Repair when docker compose up, docker_litemall service occurre log error, like... · 4e9f960d
  Alex HE authored Jun 26, 2020
```
Repair when docker compose up, docker_litemall service occurre log error, like this "The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server" (#407)
Co-authored-by: hedc <3479785008h@gmail.com>
```
  4e9f960d
- 修复优惠券优惠金额计算错误bug (#406) · 7836237d
  Tyson authored Jun 26, 2020
  
  7836237d