Commits · 630071ef51158e23c519c439911ba1ba77c4cd42 · ufo / ufo-platform

27 Jun, 2019

12 commits

Merge branch 'dev_确认收货优化' into test6.9.7 ...
630071ef
```
# Conflicts:
#	order/src/main/java/com/yoho/ufo/order/service/IBuyerOrderService.java
#	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
```
by caoyan
2019-06-27 14:23:57 +0800
Browse Files
确认收货优化
df1b0ff0

by caoyan
2019-06-27 14:21:26 +0800
Browse Files
Merge branch 'dev_确认收货优化' of http://git.yoho.cn/ufo/ufo-platform into dev_确认收货优化 ...
7e9c34c5
```
Conflicts:
	order/src/main/java/com/yoho/ufo/order/controller/BuyerOrderController.java
	order/src/main/java/com/yoho/ufo/order/service/IBuyerOrderService.java
	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
```
by mali
2019-06-27 14:17:04 +0800
Browse Files
更新鉴定室
8b2f54a8

by mali
2019-06-27 14:13:43 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7
e506278c

by caoyan
2019-06-27 11:29:38 +0800
Browse Files
确认收货优化
2be9755d

by caoyan
2019-06-27 11:29:27 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7 ...
8a2b2ea1
```
# Conflicts:
#	order/src/main/java/com/yoho/ufo/order/service/IBuyerOrderService.java
#	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
```
by caoyan
2019-06-27 11:02:40 +0800
Browse Files
确认收货优化
043947a6

by caoyan
2019-06-27 11:00:00 +0800
Browse Files
Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/ufo-platform into test6.9.7
9cf7072f

by mali
2019-06-27 10:24:26 +0800
Browse Files
根据订单货仓查询物流公司信息
8a1217ab

by mali
2019-06-27 10:24:22 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7 ...
d02bf0b2
```
# Conflicts:
#	order/src/main/java/com/yoho/ufo/order/service/IBuyerOrderService.java
```
by caoyan
2019-06-27 10:15:04 +0800
Browse Files
确认收货优化
380dfbee

by caoyan
2019-06-27 10:12:37 +0800
Browse Files

26 Jun, 2019

23 commits

Merge branch 'dev_确认收货优化' into test6.9.7
0c19d5ce

by caoyan
2019-06-26 22:14:51 +0800
Browse Files
确认收货优化
8a9bb2ec

by caoyan
2019-06-26 22:14:34 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7
4a00a032

by caoyan
2019-06-26 22:04:52 +0800
Browse Files
确认收货优化
9d42579f

by caoyan
2019-06-26 22:04:27 +0800
Browse Files
确认收货优化
763ae6a7

by caoyan
2019-06-26 21:47:04 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7
c293f498

by caoyan
2019-06-26 21:31:47 +0800
Browse Files
确认收货优化
8ca4726d

by caoyan
2019-06-26 21:30:48 +0800
Browse Files
确认收货优化
4f824bd0

by caoyan
2019-06-26 21:29:10 +0800
Browse Files
确认收货优化
1ca50a0b

by caoyan
2019-06-26 21:18:56 +0800
Browse Files
根据订单货仓查询物流公司信息
0fedc656

by mali
2019-06-26 17:58:01 +0800
Browse Files
香港客户默认地址设置
9115495a

by Lixiaodi
2019-06-26 16:29:23 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7 ...
f4f194d8
```
Conflicts:
	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
```
by caoyan
2019-06-26 15:18:19 +0800
Browse Files
确认收货优化
2db78567

by caoyan
2019-06-26 15:16:17 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7
bafcc330

by caoyan
2019-06-26 14:49:21 +0800
Browse Files
确认收货优化
04b58119

by caoyan
2019-06-26 14:48:56 +0800
Browse Files
确认收货优化
aac33d15

by caoyan
2019-06-26 14:37:43 +0800
Browse Files
Merge branch 'dev_确认收货优化' of http://git.yoho.cn/ufo/ufo-platform into dev_确认收货优化
c96a9be6

by caoyan
2019-06-26 11:51:34 +0800
Browse Files
确认收货优化
dfa5d220

by caoyan
2019-06-26 11:51:20 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7
85495b26

by mali
2019-06-26 11:18:24 +0800
Browse Files
质检app增加虚假发货寄回的场景
c29345c6

by mali
2019-06-26 11:17:30 +0800
Browse Files
fixBug：重复尺码
a8cde116

by Lixiaodi
2019-06-26 10:00:20 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7
87b7cc42

by mali
2019-06-26 09:58:13 +0800
Browse Files
客服取消虚假发货可以打印面单
a9265f98

by mali
2019-06-26 09:57:31 +0800
Browse Files

25 Jun, 2019

5 commits

Merge branch 'dev_确认收货优化' into test6.9.7
39ff5be3

by mali
2019-06-25 18:33:49 +0800
Browse Files
批量操作性能优化
76870482

by mali
2019-06-25 18:33:40 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7 ...
201cd957
```
Conflicts:
	order/src/main/java/com/yoho/ufo/order/service/IBuyerOrderService.java
	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
```
by mali
2019-06-25 18:05:25 +0800
Browse Files
批量操作性能优化
f064238b

by mali
2019-06-25 17:38:30 +0800
Browse Files
确认收货优化
a35b4dfe

by caoyan
2019-06-25 14:19:10 +0800
Browse Files

ufo / ufo-platform · Commits

GitLab

27 Jun, 2019

26 Jun, 2019

25 Jun, 2019