Junling Bu
|
1e34cdf133
|
fix[litemall-wx]: 如果关键字是空，则不查询后台类似关键字
|
2018-08-15 09:04:30 +08:00 |
|
Menethil
|
149c7d2096
|
优化首页Json数据
|
2018-08-15 03:09:46 +08:00 |
|
Menethil
|
cd3ea7403e
|
修复类别商品查询BUG
|
2018-08-15 02:05:30 +08:00 |
|
Menethil
|
78127aed91
|
物流信息改为随订单详情返回，移除物流订单API
|
2018-08-15 00:29:41 +08:00 |
|
Menethil
|
786e8e8c2f
|
商品信息添加返回原价
|
2018-08-14 16:41:46 +08:00 |
|
Junling Bu
|
82c54a0a73
|
修复Spring Boot升级带来的报错。
|
2018-08-14 12:47:07 +08:00 |
|
Junling Bu
|
3f54477592
|
chore[litemall-wx-api]: 暂时取消pom.xml中docker相关配置
|
2018-08-14 09:39:42 +08:00 |
|
Menethil
|
bdde636370
|
Merge remote-tracking branch 'origin/master'
|
2018-08-14 01:14:32 +08:00 |
|
Menethil
|
92b3446a9d
|
修复时间判断错误
|
2018-08-14 01:14:21 +08:00 |
|
Junling Bu
|
3883fa461d
|
fix: 小商城分类搜索无效果
|
2018-08-13 23:03:13 +08:00 |
|
Menethil
|
0271ab4fba
|
修复广告设置未启用仍显示BUG
|
2018-08-12 13:46:25 +08:00 |
|
Menethil
|
cc5a1c17d9
|
添加提交订单时验证团购活动是否过期
|
2018-08-11 05:57:49 +08:00 |
|
Junling Bu
|
a698766f51
|
fix[litemall-wx]: 商品足迹不能跳转商品
|
2018-08-10 15:07:56 +08:00 |
|
Junling Bu
|
0627802cb0
|
fix[litemall-core]: 七牛存储里面的上传凭证实时生成
|
2018-08-10 14:26:20 +08:00 |
|
Junling Bu
|
c6ed4cb4b6
|
chore: mybatis第三方插件更新到1.2.10
|
2018-08-10 13:50:23 +08:00 |
|
Junling Bu
|
6e20baa0ff
|
Merge branch 'master' of https://github.com/linlinjava/litemall
|
2018-08-10 13:35:13 +08:00 |
|
Junling Bu
|
3c8ff16661
|
chore: 把团购相关表结构移植到总表。
|
2018-08-10 13:31:44 +08:00 |
|
Menethil
|
de76462a00
|
Merge remote-tracking branch 'origin/master'
|
2018-08-10 13:31:04 +08:00 |
|
Menethil
|
8e8c14b17b
|
修复图片上传未返回Bug
|
2018-08-10 13:29:55 +08:00 |
|
youc3576
|
ac24031e74
|
!4 修复一级类目无二级类目时 后台报数组越界异常
Merge pull request !4 from youc3576/master
|
2018-08-10 12:47:53 +08:00 |
|
Junling Bu
|
86b01d7eb7
|
chore[litemall-admin-api, litemall-admin]: 清理团购规则页面代码
|
2018-08-10 11:09:48 +08:00 |
|
Junling Bu
|
f2999cf2e5
|
chore: 调整代码结构
|
2018-08-10 10:52:04 +08:00 |
|
youc
|
a34a95f82d
|
Merge branch 'master' of https://gitee.com/youc-project/litemall
|
2018-08-10 09:10:44 +08:00 |
|
youc
|
f9f41412f8
|
fix
|
2018-08-10 09:01:17 +08:00 |
|
Junling Bu
|
1315bc8d2a
|
fix[litemall-wx-api]: 商品排序字段支持name
|
2018-08-10 00:05:43 +08:00 |
|
Menethil
|
a697e69654
|
小程序添加团购
|
2018-08-09 21:41:58 +08:00 |
|
Menethil
|
b2d9fd3c12
|
Merge remote-tracking branch 'origin/master'
|
2018-08-09 21:38:01 +08:00 |
|
Menethil
|
e3bedf44fe
|
管理后台添加分享图显示
|
2018-08-09 21:10:41 +08:00 |
|
Junling Bu
|
bc7231a6e4
|
fix[litemall-core]: 配置七牛云出错
|
2018-08-09 19:06:26 +08:00 |
|
Junling Bu
|
da5beedf38
|
chore[litemall-core]: 添加一个IllegalArgumentException的处理器
|
2018-08-09 19:05:50 +08:00 |
|
Junling Bu
|
13cb81792c
|
fix[litemall-wx-api]: 购物车表项添加时设置添加时间
|
2018-08-09 18:42:49 +08:00 |
|
Menethil
|
0b1435e09e
|
Merge remote-tracking branch 'origin/master'
|
2018-08-09 16:33:38 +08:00 |
|
Junling Bu
|
4fc62cd286
|
feat[litemall-core]: 支持七牛云对象存储
|
2018-08-09 14:50:52 +08:00 |
|
Junling Bu
|
ebc1fe35c2
|
chore[litemall-admin-api, litemall-wx-api]: 修复升级spring boot 2.0带来的warning
|
2018-08-09 10:47:47 +08:00 |
|
Menethil
|
02a41fd431
|
优化团购
|
2018-08-08 15:46:59 +08:00 |
|
Junling Bu
|
05d50c9b91
|
fix[litemall-wx]: 购物车下单页面链接不正确。
|
2018-08-08 14:10:00 +08:00 |
|
Menethil
|
eec5e2227c
|
添加团购后台管理
|
2018-08-08 03:17:25 +08:00 |
|
Menethil
|
ba09316751
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
|
2018-08-08 00:35:53 +08:00 |
|
Junling Bu
|
9ac4415166
|
fix[litemall-admin-api, litemall-wx-api]: 微调代码
|
2018-08-07 15:42:54 +08:00 |
|
Menethil
|
985b6efb9d
|
首页数据添加一个简单的缓存
|
2018-08-07 04:01:57 +08:00 |
|
Menethil
|
fd710d1524
|
添加团购
|
2018-08-07 03:44:52 +08:00 |
|
Menethil
|
6f8bedd4e5
|
修改StoreService
|
2018-08-06 21:09:33 +08:00 |
|
Menethil
|
23b1821a17
|
添加团购
|
2018-08-06 09:42:17 +08:00 |
|
Menethil
|
39135af382
|
添加团购
|
2018-08-05 19:19:32 +08:00 |
|
Menethil
|
84afede401
|
Merge remote-tracking branch 'origin/master'
|
2018-08-05 19:03:25 +08:00 |
|
Junling Bu
|
b268df0d09
|
chore[litemall-db]: 采用spring-boot-starter-json
|
2018-08-04 23:50:38 +08:00 |
|
Junling Bu
|
61fcfc4faa
|
fix[litemall-admin-api]: region表只支持id，没有add_time
|
2018-08-04 22:24:01 +08:00 |
|
Junling Bu
|
9d3aca598b
|
chore: 升级Spring Boot到2.0.4
|
2018-08-04 22:21:55 +08:00 |
|
Junling Bu
|
0ebabe1fbc
|
chore[litemall-core]:整理pom.xml
|
2018-08-04 21:06:19 +08:00 |
|
Junling Bu
|
a9527a2317
|
refact: 图片存储服务的API调整
|
2018-08-04 19:09:46 +08:00 |
|