ufo / yohoufo-fore · Commits

27 Dec, 2018

19 commits

鉴定结果查询--缓存修改
c627b939

by mlge
2018-12-27 17:27:17 +0800
Browse Files
Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.4
665cbf4b

by mlge
2018-12-27 16:18:18 +0800
Browse Files
鉴定结果查询接口--修改用户默认的头像
3ae935ad

by mlge
2018-12-27 16:18:13 +0800
Browse Files
Merge branch 'dev_6.8.4_order' into test6.8.4
1bee85a9

by wujiexiang
2018-12-27 16:01:40 +0800
Browse Files
add log file
d0e23356

by wujiexiang
2018-12-27 16:01:06 +0800
Browse Files
搜索接口拆分
1cc06493

by Lixiaodi
2018-12-27 15:09:34 +0800
Browse Files
Merge branch 'dev_6.8.4_order' into test6.8.4
a5de905f

by wujiexiang
2018-12-27 14:12:17 +0800
Browse Files
新增日志文件
d31f705a

by wujiexiang
2018-12-27 14:11:40 +0800
Browse Files
Merge branch 'dev_6.8.4_order' into test6.8.4
5a87b116

by wujiexiang
2018-12-27 10:41:45 +0800
Browse Files
添加日志
8919c58f

by wujiexiang
2018-12-27 10:37:35 +0800
Browse Files
Merge branch 'dev_6.8.4_order' into test6.8.4
be50d8b4

by wujiexiang
2018-12-27 10:20:03 +0800
Browse Files
批量操作失败告警
1a52cb4c

by wujiexiang
2018-12-27 10:19:28 +0800
Browse Files
Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.4 ...
4364a1e1
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/SellerOrderListService.java
#	order/src/main/java/com/yohoufo/order/utils/OrderAssist.java
```
by chenchao
2018-12-27 10:17:05 +0800
Browse Files
optimized replicate code
69d354e7

by chenchao
2018-12-27 10:12:52 +0800
Browse Files
Merge branch 'master' into test6.8.4
385d167e

by mali
2018-12-27 10:08:47 +0800
Browse Files
Merge branch 'hotfix_erp_add_mobile_1218'
b4c99c9c

by mali
2018-12-27 10:04:21 +0800
Browse Files
Merge branch 'hotfix_溢价提示错误' into test6.8.4 ...
a995f878
```
Conflicts:
	order/src/main/java/com/yohoufo/order/service/impl/SellerOrderListService.java
```
by mali
2018-12-27 10:02:56 +0800
Browse Files
fix bug :overflow price tips key
c3795709

by chenchao
2018-12-27 09:59:09 +0800
Browse Files
物流显示fix
2004f50e

by qinchao
2018-12-27 09:54:26 +0800
Browse Files

26 Dec, 2018

21 commits

是否可退款的状态check
3b6240b0

by tanling
2018-12-26 16:33:48 +0800
Browse Files
Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.4
4bd4f421

by tanling
2018-12-26 16:16:29 +0800
Browse Files
支付回调手动取消也退款
5cc302ca

by tanling
2018-12-26 16:16:25 +0800
Browse Files
revert
35edafe7

by LUOXC
2018-12-26 16:13:16 +0800
Browse Files
Merge branch 'dev6.8.4' into test6.8.4
8d200777

by LUOXC
2018-12-26 16:12:29 +0800
Browse Files
fix datatype convert error
468f0915

by chenchao
2018-12-26 16:02:25 +0800
Browse Files
删除卖家订单列表/详情鉴定视频
4456746d

by LUOXC
2018-12-26 15:27:44 +0800
Browse Files
待支付才需要到第三方
f47317e5

by tanling
2018-12-26 15:23:21 +0800
Browse Files
Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.4
c2e6633d

by caoyan
2018-12-26 15:07:54 +0800
Browse Files
批量查询价格
e316fd49

by caoyan
2018-12-26 15:07:45 +0800
Browse Files
Merge branch 'dev_6.8.4_order' into test6.8.4
db9983bf

by wujiexiang
2018-12-26 14:51:21 +0800
Browse Files
参数校验
9ff16d6f

by wujiexiang
2018-12-26 14:50:47 +0800
Browse Files
throw out exception
c0bbe5a3

by chenchao
2018-12-26 14:31:34 +0800
Browse Files
Merge branch 'hotfix_1224_paycancel' into test6.8.4
2389f1b5

by tanling
2018-12-26 14:02:55 +0800
Browse Files
消息重试时间设置
7396191a

by tanling
2018-12-26 14:02:06 +0800
Browse Files
Merge branch 'dev_6.8.4_order' into test6.8.4
5f0cc88e

by wujiexiang
2018-12-26 13:46:14 +0800
Browse Files
add
1a9b7b5a

by wujiexiang
2018-12-26 13:45:56 +0800
Browse Files
设置支付超时时间为30
71d5a9d0

by wujiexiang
2018-12-26 11:55:45 +0800
Browse Files
Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.4
bf0f9317

by tanling
2018-12-26 11:28:47 +0800
Browse Files
Arrays.asList->list非空判断
81be37f6

by tanling
2018-12-26 11:28:43 +0800
Browse Files
卖家扫描快递单号，单号信息检查，不能有http
d5007668

by qinchao
2018-12-26 10:56:44 +0800
Browse Files