ufo / yohoufo-fore · Commits

22 Nov, 2018

40 commits

fix seller order status
de67d87e

by chenchao
2018-11-22 19:47:08 +0800
Browse Files
Merge branch 'dev_order' of http://git.yoho.cn/ufo/yohoufo-fore into dev_order
84f08074

by chenchao
2018-11-22 19:46:01 +0800
Browse Files
bug修改
9327317d

by Lixiaodi
2018-11-22 19:44:07 +0800
Browse Files
Merge branch 'dev_order' into test6.8.2 ...
d5afb0e1
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/MerchantOrderPaymentService.java
```
by chenchao
2018-11-22 19:35:44 +0800
Browse Files
配置
ded0982c

by qinchao
2018-11-22 18:49:49 +0800
Browse Files
Merge branch 'dev_order' of http://git.yoho.cn/ufo/yohoufo-fore into dev_order
e9192fbe

by Lixiaodi
2018-11-22 18:24:17 +0800
Browse Files
增加钱包明细bean
f7362cd6

by Lixiaodi
2018-11-22 18:24:05 +0800
Browse Files
入驻商户接口变更 user -> order
9edbadea

by qinchao
2018-11-22 18:23:28 +0800
Browse Files
clean cache
4aa6303f

by chenchao
2018-11-22 18:17:52 +0800
Browse Files
Merge branch 'dev_order' into test6.8.2
142e2d15

by chenchao
2018-11-22 17:46:48 +0800
Browse Files
add log
7e8ae4eb

by chenchao
2018-11-22 17:45:03 +0800
Browse Files
Merge branch 'dev_order' into test6.8.2
20f2f7ca

by Lixiaodi
2018-11-22 17:37:56 +0800
Browse Files
增加uid转账
05f7fc6f

by Lixiaodi
2018-11-22 17:37:35 +0800
Browse Files
Merge branch 'dev_order' into test6.8.2
9ec244ce

by Lixiaodi
2018-11-22 17:04:51 +0800
Browse Files
bug修改
63abc760

by Lixiaodi
2018-11-22 17:04:02 +0800
Browse Files
钱包表空值处理
994e581b

by Lixiaodi
2018-11-22 16:24:29 +0800
Browse Files
商品排序修改
53f76f43

by Lixiaodi
2018-11-22 16:12:20 +0800
Browse Files
商品排序修改
415598e5

by Lixiaodi
2018-11-22 16:11:53 +0800
Browse Files
Merge branch 'dev_order' into test6.8.2
8f63a081

by Lixiaodi
2018-11-22 15:45:50 +0800
Browse Files
Merge branch 'dev_order' of http://git.yoho.cn/ufo/yohoufo-fore into dev_order
18b40e9e

by Lixiaodi
2018-11-22 15:44:50 +0800
Browse Files
bug修改
fb08cf3e

by Lixiaodi
2018-11-22 15:44:01 +0800
Browse Files
fix
48bd3398

by chenchao
2018-11-22 15:43:47 +0800
Browse Files
bug修改
d0acf146

by Lixiaodi
2018-11-22 15:41:51 +0800
Browse Files
日志完善
a36d8c0e

by Lixiaodi
2018-11-22 15:28:26 +0800
Browse Files
日志完善
23d5c1ac

by Lixiaodi
2018-11-22 15:26:45 +0800
Browse Files
bug修改
4882b064

by Lixiaodi
2018-11-22 15:14:21 +0800
Browse Files
Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.2
7a33fbe7

by qinchao
2018-11-22 14:52:18 +0800
Browse Files
去掉不用的类
970cd572

by qinchao
2018-11-22 14:52:10 +0800
Browse Files
Merge branch 'dev_order' of http://git.yoho.cn/ufo/yohoufo-fore into dev_order
c5cea007

by Lixiaodi
2018-11-22 14:41:00 +0800
Browse Files
bug修改
b35b3f73

by Lixiaodi
2018-11-22 14:40:38 +0800
Browse Files
finish code 4 batch change price
ecafb86f

by chenchao
2018-11-22 14:37:52 +0800
Browse Files
Merge branch 'test6.8.2' into dev_order
333c2c60

by chenchao
2018-11-22 14:32:25 +0800
Browse Files
almost complete batch change price
eaf3770f

by chenchao
2018-11-22 14:31:53 +0800
Browse Files
Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.2
09340625

by mlge
2018-11-22 13:46:49 +0800
Browse Files
支付宝自动绑定接口
e5fc26bc

by mlge
2018-11-22 13:46:43 +0800
Browse Files
Merge branch 'dev_qc_1122_fix_1' into test6.8.2
15a9c0fd

by qinchao
2018-11-22 11:45:43 +0800
Browse Files
Merge branch 'dev_order' of http://git.yoho.cn/ufo/yohoufo-fore into dev_order
f021492c

by Lixiaodi
2018-11-22 11:22:03 +0800
Browse Files
bug修改
cad5392b

by Lixiaodi
2018-11-22 11:21:52 +0800
Browse Files
Merge branch 'dev_order' into test6.8.2
03755c45

by chenchao
2018-11-22 11:05:09 +0800
Browse Files
add tips
241ad6a0

by chenchao
2018-11-22 11:04:20 +0800
Browse Files