ufo / yohoufo-fore · Commits

20 Jun, 2019

3 commits

香港仓财务结算
605b729b

by LUOXC
2019-06-20 13:19:54 +0800
Browse Files
结算
d6469b90

by LUOXC
2019-06-20 11:27:27 +0800
Browse Files
add status
4a756909

by LUOXC
2019-06-20 10:06:49 +0800
Browse Files

19 Jun, 2019

3 commits

香港仓结算
bd9e1d22

by LUOXC
2019-06-19 18:41:15 +0800
Browse Files
不转账香港号
204479ef

by LUOXC
2019-06-19 17:07:11 +0800
Browse Files
refactor
81d8d65c

by LUOXC
2019-06-19 09:33:09 +0800
Browse Files

18 Jun, 2019

10 commits

Merge branch 'test6.9.6' into dev6.9.7 ...
4db41019
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
```
by LUOXC
2019-06-18 17:58:57 +0800
Browse Files
添加选择方法
9afea335

by LUOXC
2019-06-18 17:53:52 +0800
Browse Files
Merge branch 'dev-coupon-recommend' into test6.9.6
b3786adb

by wujiexiang
2019-06-18 16:33:41 +0800
Browse Files
结算页券列表显示即将过期
2f7eb6f1

by wujiexiang
2019-06-18 16:33:23 +0800
Browse Files
Merge branch 'dev-coupon-recommend' into test6.9.6
d7791144

by wujiexiang
2019-06-18 15:26:36 +0800
Browse Files
优惠券优化-即将到期
5ffc8669

by wujiexiang
2019-06-18 15:25:18 +0800
Browse Files
Merge branch 'hotfix-buyerpenalty' into test6.9.7
b66a3bf5

by LUOXC
2019-06-18 14:09:56 +0800
Browse Files
使用商品金额惩罚买家
a290adba

by LUOXC
2019-06-18 11:59:47 +0800
Browse Files
卖家展示收入金额
469cc55b

by tanling
2019-06-18 11:43:43 +0800
Browse Files
refactor
fc94b204

by LUOXC
2019-06-18 10:52:51 +0800
Browse Files

17 Jun, 2019

2 commits

发售日历类型 1：有货; 2：ufo ; 3：混合
690bbcc5

by Lixiaodi
2019-06-17 17:29:13 +0800
Browse Files
发售日历类型 1：有货; 2：ufo ; 3：混合
336d008d

by Lixiaodi
2019-06-17 17:03:12 +0800
Browse Files

14 Jun, 2019

14 commits

Merge branch 'dev-coupon-recommend' into test6.9.6
acd1cbf4

by wujiexiang
2019-06-14 18:53:41 +0800
Browse Files
paymentjiek返回是否支持用券
2c28fe2f

by wujiexiang
2019-06-14 18:53:09 +0800
Browse Files
show promotion desc when goods fee rate is zero
1021ccf7

by chenchao
2019-06-14 18:38:57 +0800
Browse Files
Merge branch 'test6.9.6' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.6
0a838196

by chenchao
2019-06-14 18:07:38 +0800
Browse Files
show promotion desc when goods fee rate is zero
091ea201

by chenchao
2019-06-14 18:07:29 +0800
Browse Files
Merge branch 'hotfix_出售费率展示' into test6.9.7
80e9d4d4

by chenchao
2019-06-14 16:03:46 +0800
Browse Files
Merge branch 'hotfix_出售费率展示' into test6.9.6
0bf7f147

by chenchao
2019-06-14 16:02:59 +0800
Browse Files
show promotion desc when goods fee rate is zero
b0dfc994

by chenchao
2019-06-14 15:57:21 +0800
Browse Files
字符串相似系数比率可配置
e89fcf73

by tanling
2019-06-14 14:56:01 +0800
Browse Files
买家地址不能是鉴定中心地址
905f6b4a

by tanling
2019-06-14 14:41:45 +0800
Browse Files
买家地址不能是鉴定中心地址
64163f06

by tanling
2019-06-14 14:34:47 +0800
Browse Files
买家地址不能是鉴定中心
5de124da

by tanling
2019-06-14 11:57:46 +0800
Browse Files
Merge branch 'test6.9.6' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.6
f46c11b2

by tanling
2019-06-14 11:02:07 +0800
Browse Files
买家地址不能是鉴定中心地址
0c233253

by tanling
2019-06-14 11:02:04 +0800
Browse Files

13 Jun, 2019

4 commits

skup type support
43a80c7d

by chenchao
2019-06-13 18:14:22 +0800
Browse Files
添加银行卡打款
bc718412

by LUOXC
2019-06-13 16:01:08 +0800
Browse Files
complete compute method
8175ddc8

by chenchao
2019-06-13 11:39:37 +0800
Browse Files
add seller asset policy 4 adjust pay
520bae44

by chenchao
2019-06-13 09:34:37 +0800
Browse Files

12 Jun, 2019

4 commits

Merge branch 'hotfix_0605_erpStatusStr' into test6.9.6
2117488c

by tanling
2019-06-12 19:36:36 +0800
Browse Files
Merge branch 'hotfix_0605_erpStatusStr' of http://git.yoho.cn/ufo/yohoufo-fore i… ...
f909ad8d
```
…nto hotfix_0605_erpStatusStr
```
by tanling
2019-06-12 19:36:09 +0800
Browse Files
解决并发不可重复领取的问题
38209753

by tanling
2019-06-12 19:36:01 +0800
Browse Files
Merge branch 'dev-coupon-recommend' into test6.9.6
38f51a60

by wujiexiang
2019-06-12 18:01:14 +0800
Browse Files