theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,092 Commits 1 Branch 0 Tags
35bf2e5492236e8c5461bcb3850b61c0f93ff987
Commit Graph

1092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
linlinjava
35bf2e5492 feat[litemall-admin,litemall-admin-api]:订单收款 2020-11-29 14:16:58 +08:00
linlinjava
c0541fdeaf chore 2020-11-29 13:41:24 +08:00
linlinjava
2a6ab95809 Merge branch 'master' of https://gitee.com/linlinjava/litemall 2020-11-29 12:08:28 +08:00
linlinjava
1e37ac4589 chore 2020-11-29 12:05:34 +08:00
linlinjava
f50138243c chore 2020-11-29 11:12:07 +08:00
linlinjava
be8cfb3e56 !53 评论列表返回评价等级 
Merge pull request !53 from 滑稽刘/N/A
 2020-11-26 14:24:34 +08:00
滑稽刘
5172853a30 评论列表返回评价等级 2020-11-26 11:52:30 +08:00
linlinjava
d4dde95b46 fix[litemall-admin]: gitee #I1X232 2020-11-22 21:01:43 +08:00
linlinjava
d8f59965f2 fix[litemall-admin]: gitee #I1X21W 2020-11-22 20:56:06 +08:00
linlinjava
7684810beb fix 2020-11-22 12:40:03 +08:00
linlinjava
79135cc1a7 chore 2020-11-22 09:36:53 +08:00
linlinjava
599158a3d8 Merge branch 'gouxionglai-master' 2020-11-01 18:49:01 +08:00
linlinjava
f781cdeb7e chore 2020-11-01 18:48:37 +08:00
linlinjava
909974d6c6 Merge branch 'master' of https://github.com/gouxionglai/litemall into gouxionglai-master 2020-11-01 18:43:30 +08:00
linlinjava
c4da8fb5b0 chore: druid升级1.2.1 2020-11-01 18:22:10 +08:00
linlinjava
aabc261708 chore: shiro升级版本1.6.0 2020-11-01 17:14:39 +08:00
gouxionglai
40df965c6f 1.wx：补充售罄的CSS 2020-10-28 11:38:46 +08:00
gouxionglai
741e1ebb7f 1.admin：去掉规格图片 
2.wx：选择不同规格时展示不同图片，默认第一张。
 2020-10-28 10:52:57 +08:00
端午安康
5af77957b6 Merge pull request #2 from linlinjava/master 
update
 2020-10-20 11:50:47 +08:00
linlinjava
9cf5856446 fix 2020-09-28 09:29:07 +08:00
linlinjava
04d4fc9c41 !50 fix:售后退款只退一部分会失败的问题 
Merge pull request !50 from 宋浩志/N/A
 2020-09-27 09:33:27 +08:00
宋浩志
332e93199b fix:售后退款只退一部分会失败的问题 2020-09-26 12:30:03 +08:00
changyang liu
2b69527d0d 阿里云发送短信优化，在返回错误后记录日志以及返回发送失败状态 (#429) 
Co-authored-by: yang <477915244yang@gmail.com>
 2020-08-21 16:41:08 +08:00
端午安康
2f3ef296f2 Merge pull request #1 from linlinjava/master 
update
 2020-08-04 10:20:46 +08:00
dependabot[bot]
83711ec270 build(deps): bump elliptic from 6.5.2 to 6.5.3 in /litemall-vue (#422) 
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>
 2020-08-03 09:54:41 +08:00
linlinjava
749e6ab251 chore: 小程序端取消手机号码校验，后端减弱手机号码校验。 2020-07-31 11:54:23 +08:00
laiyingzeng
9d5aafff75 修改litemall-admin专题topic.vue页面批量删除按钮权限错误 (#421) 
* 解决mysql-connector-java为8.0.16时MyBatis Generator无法生成XXXByPrimaryKey相关方法

* 修改litemall-admin专题topic.vue页面批量删除按钮权限错误

Co-authored-by: laiyingzeng <laiyingzeng@gmail.com>
 2020-07-29 09:54:50 +08:00
lagelanren
a54ba21386 serverTimezone=UTC 导致数据库取出来时间早8个小时 (#420) 2020-07-28 21:53:41 +08:00
dependabot[bot]
8353ed1054 build(deps): bump lodash from 4.17.15 to 4.17.19 in /litemall-vue (#419) 
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>
 2020-07-22 20:45:32 +08:00
laiyingzeng
0262f38cf8 解决mysql-connector-java为8.0.16时MyBatis Generator无法生成XXXByPrimaryKey相关方法 (#418) 
Co-authored-by: laiyingzeng <laiyingzeng@gmail.com>
 2020-07-19 23:33:45 +08:00
linlinjava
199c56007c !47 完善会员管理,添加用户id查询和用户编辑 
Merge pull request !47 from 滑稽刘/master
 2020-07-18 23:26:46 +08:00
linlinjava
2365bed6f4 chore: 数据库驱动名称更新 2020-07-05 13:30:49 +08:00
滑稽刘
8dd7c4bb2c 完善会员管理,添加用户id查询和用户编辑 2020-07-05 11:25:23 +08:00
Junling Bu
c0d5ebc53f Merge branch 'master' of https://gitee.com/linlinjava/litemall 2020-07-03 10:44:23 +08:00
dependabot[bot]
fa189cdcf4 build(deps): bump mysql-connector-java from 5.1.46 to 8.0.16 (#410) 
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>
 2020-07-03 10:43:20 +08:00
dependabot[bot]
25518ade9f build(deps): bump mysql-connector-java in /litemall-db (#411) 
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>
 2020-07-03 10:43:00 +08:00
linlinjava
d0a5ee239f !46 限制加入自己开团团购部分加入判空，否则其他用户无法惨团 
Merge pull request !46 from 滑稽刘/master
 2020-07-03 10:41:52 +08:00
滑稽刘
27e6d275d1 限制加入自己开团团购部分加入判空，否则用户无法惨团 2020-07-02 21:08:49 +08:00
Junling Bu
1a6e2e9a85 Merge branch 'dev' of https://github.com/linlinjava/litemall 2020-06-29 15:40:45 +08:00
Batur
04c716de05 修复收货地址页面导航栏重复 (#409) 2020-06-29 15:39:55 +08:00
linlinjava
eeeaf3815c !44 添加售后详情状态显示，添加订单根据id查询 
Merge pull request !44 from 滑稽刘/master
 2020-06-27 16:40:10 +08:00
滑稽刘
9d2c07a11f 添加售后详情状态显示，添加订单根据id查询 2020-06-27 15:23:15 +08:00
滑稽刘
7ff311b604 添加售后状态显示，添加订单根据id查询 2020-06-27 15:17:51 +08:00
linlinjava
ef91b166f3 !42 修复了售后详情无法点击的问题 
Merge pull request !42 from 滑稽刘/master
 2020-06-27 12:57:08 +08:00
滑稽刘
67ba9dcaeb 修复了售后详情无法点击的问题 2020-06-27 11:14:01 +08:00
Junling Bu
0395ecd391 Merge branch 'master' of https://github.com/linlinjava/litemall 2020-06-26 09:14:13 +08:00
Alex HE
4e9f960d4c 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>
 2020-06-26 09:13:28 +08:00
Tyson
7836237d70 修复优惠券优惠金额计算错误bug (#406) 2020-06-26 09:12:14 +08:00
linlinjava
2410955929 !40 更改一处sql字段的注释 
Merge pull request !40 from 九月家的敖烈/master
 2020-06-26 09:10:51 +08:00
九月家的敖烈
2b481b4337 更正sql中litemall_aftersale表的deleted字段的注释 2020-06-22 21:50:59 +08:00