ufo / yohoufo-fore · Commits

20 Sep, 2018

8 commits

Merge branch 'master' into dev
c8dbb09e

by tanling
2018-09-20 10:15:06 +0800
Browse Files
订单号
0772a74d

by tanling
2018-09-20 10:09:54 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev ...
8b05e476
```
* 'dev' of http://git.yoho.cn/ufo/yohoufo-fore:
  支付
  fix
```
by zhaojun2
2018-09-20 10:00:39 +0800
Browse Files
add 筛选项接口
98602ef7

by zhaojun2
2018-09-20 10:00:29 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore ...
380e5abe
```
# Conflicts:
#	common/src/main/java/com/yohoufo/common/utils/DateUtil.java
```
by tanling
2018-09-20 09:42:54 +0800
Browse Files
支付
ba2ce034

by tanling
2018-09-20 09:41:48 +0800
Browse Files
fix
52ab4655

by sailing-PC\sailing
2018-09-20 09:39:01 +0800
Browse Files
fix
df688539

by sailing-PC\sailing
2018-09-20 09:30:11 +0800
Browse Files

19 Sep, 2018

25 commits

optimized
de6ba9b2

by sailing-PC\sailing
2018-09-19 21:48:14 +0800
Browse Files
optimized
314766df

by sailing-PC\sailing
2018-09-19 20:27:28 +0800
Browse Files
optimized
f4a12b97

by sailing-PC\sailing
2018-09-19 20:18:39 +0800
Browse Files
delete useless
a8b8dfa6

by ken.hu
2018-09-19 18:31:18 +0800
Browse Files
4 extends other actor type
560f8e14

by sailing-PC\sailing
2018-09-19 18:24:40 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
ed10fc63

by ken.hu
2018-09-19 17:43:53 +0800
Browse Files
resource
7ffc5ab5

by ken.hu
2018-09-19 17:43:20 +0800
Browse Files
inbox template message
da36aec3

by csgyoho
2018-09-19 17:37:33 +0800
Browse Files
inbox redis添加
b52055ad

by csgyoho
2018-09-19 17:09:21 +0800
Browse Files
Merge branch 'master' into dev
bf516c83

by sailing-PC\sailing
2018-09-19 17:08:33 +0800
Browse Files
add base map data
e7e7e113

by sailing-PC\sailing
2018-09-19 17:01:54 +0800
Browse Files
商品列表
21e87669

by zhaojun2
2018-09-19 16:50:55 +0800
Browse Files
订单
8be55a9d

by tanling
2018-09-19 16:18:51 +0800
Browse Files
订单
481c3cfa

by tanling
2018-09-19 15:46:42 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
17413c49

by tanling
2018-09-19 15:36:22 +0800
Browse Files
支付
20a4be8e

by tanling
2018-09-19 15:36:18 +0800
Browse Files
no message
1501ad84

by csgyoho
2018-09-19 15:35:08 +0800
Browse Files
inbox新增sdk以及redis缓存
a6186e5e

by csgyoho
2018-09-19 15:28:52 +0800
Browse Files
实名认证接口-开启图形验证码
3d68cd1e

by qinchao
2018-09-19 14:40:51 +0800
Browse Files
bugfix
7dfd8ea8

by zhaojun2
2018-09-19 14:31:58 +0800
Browse Files
bugfix
ec8e1ab3

by zhaojun2
2018-09-19 14:12:23 +0800
Browse Files
bugfix
747bc2ef

by zhaojun2
2018-09-19 13:57:56 +0800
Browse Files
Merge branch 'dev'
86bdcc22

by mali
2018-09-19 13:39:50 +0800
Browse Files
Merge branch 'dev_product'
68e99a3d

by mali
2018-09-19 13:35:09 +0800
Browse Files
add productsorttemplate
0813ec10

by zhaojun2
2018-09-19 11:01:46 +0800
Browse Files

18 Sep, 2018

7 commits

bug修改
8d84baa1

by Lixiaodi
2018-09-19 02:39:41 +0800
Browse Files
Merge branch 'master' into dev ...
0fd3ea3e
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/controller/BuyerOrderController.java
```
by sailing-PC\sailing
2018-09-18 21:48:51 +0800
Browse Files
add status map data
647d4023

by sailing-PC\sailing
2018-09-18 21:43:28 +0800
Browse Files
微信1;支付宝2
d7ebb7a7

by tanling
2018-09-18 21:07:09 +0800
Browse Files
订单逻辑物理删除
0af8f5be

by tanling
2018-09-18 20:55:24 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
c28682b5

by tanling
2018-09-18 20:03:01 +0800
Browse Files
no message
aedbb75b

by tanling
2018-09-18 20:02:57 +0800
Browse Files