lhm 6a6d2bb155 Merge branch 'master' of zhh/kmall-haikong into master 3 gadi atpakaļ
..
annotation 6b40a11b55 修改支付模块和收银端选择寄送方式 4 gadi atpakaļ
aop 058def0cd6 小票打印、收发货地址、系统日志以及小票颜色变更逻辑等 3 gadi atpakaļ
biz 828b82439a 下单流程修改,去除mq配置 3 gadi atpakaļ
config c48aeb1410 添加清关完成发送阿里云短信模块 3 gadi atpakaļ
controller b7836bcde2 修复页面bug 3 gadi atpakaļ
cuspay 537714ea26 支付凭证回传,商品详情主图 3 gadi atpakaļ
dao b7836bcde2 修复页面bug 3 gadi atpakaļ
dto d5d23ae0f2 Merge remote-tracking branch 'origin/master' into feature/管理端bug修复1211 3 gadi atpakaļ
entity 33e32a4eb6 活动相关bug修复,订单详情新增积分抵扣数量、积分抵扣金额 3 gadi atpakaļ
fromcomm 27e6af365d 通知回调接口1123 3 gadi atpakaļ
haikong 4edcbb9773 Merge branch 'master' of http://git.ds-bay.com/project/kmall-haikong into feature/test 3 gadi atpakaļ
properties c48aeb1410 添加清关完成发送阿里云短信模块 3 gadi atpakaļ
service 6a6d2bb155 Merge branch 'master' of zhh/kmall-haikong into master 3 gadi atpakaļ
task c48aeb1410 添加清关完成发送阿里云短信模块 3 gadi atpakaļ
utils c48aeb1410 添加清关完成发送阿里云短信模块 3 gadi atpakaļ
websocket bc0a2a950d 第一次校验库存优化 3 gadi atpakaļ