ufo / ufo-platform · Commits

15 Jan, 2019

1 commit

营业执照
3aaec0ec

by caoyan
2019-01-15 14:15:53 +0800
Browse Files

14 Jan, 2019

20 commits

redis
b0ef3db5

by qinchao
2019-01-14 20:06:43 +0800
Browse Files
Merge branch 'dev_685_质检状态拆分' into test6.8.5
6093a2c8

by qinchao
2019-01-14 19:38:54 +0800
Browse Files
物流
24dc6aa6

by qinchao
2019-01-14 19:38:35 +0800
Browse Files

Merge branch 'master' into test6.8.5 ...

Conflicts:
	dal/src/main/java/com/yoho/order/model/BuyerOrderReq.java
	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
	web/src/main/webapp/html/judgeCenter/list.html

by

2019-01-14 19:00:31 +0800

Merge branch 'dev_685_质检状态拆分' into test6.8.5
ae24402f

by qinchao
2019-01-14 16:32:55 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/ufo-platform into test6.8.5
c371636c

by Lixiaodi
2019-01-14 16:20:48 +0800
Browse Files
平台session过期时间设置成4小时
a61c571e

by Lixiaodi
2019-01-14 16:20:40 +0800
Browse Files
redis统一用ufo的redis
94fcd919

by mali
2019-01-14 15:54:43 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/ufo-platform into test6.8.5
355ea265

by mali
2019-01-14 15:51:40 +0800
Browse Files
redis统一用ufo的redis
ac23e7c8

by mali
2019-01-14 15:51:33 +0800
Browse Files
质检
a4d810a5

by qinchao
2019-01-14 15:39:52 +0800
Browse Files
测试session时间配置
7aa12958

by Lixiaodi
2019-01-14 15:31:25 +0800
Browse Files
质检
0e9547e6

by qinchao
2019-01-14 15:12:38 +0800
Browse Files
测试session时间配置
942fd4fd

by Lixiaodi
2019-01-14 15:12:08 +0800
Browse Files
测试session时间配置
e4eb9af8

by Lixiaodi
2019-01-14 15:11:40 +0800
Browse Files
鉴定视频优化
8f66b40f

by mali
2019-01-14 14:26:21 +0800
Browse Files
增加dal
d617bd59

by qinchao
2019-01-14 14:20:16 +0800
Browse Files
质检开始
92f50fb1

by qinchao
2019-01-14 13:49:58 +0800
Browse Files
鉴定视频优化
4eacb368

by mali
2019-01-14 12:40:15 +0800
Browse Files
鉴定视频优化
5e6253d8

by mali
2019-01-14 11:16:31 +0800
Browse Files

11 Jan, 2019

2 commits

Merge branch 'hot_fix/judge_tabs_rollId' into 'test6.8.5' ...
5ce658ed
```
Hot fix/judge tabs roll



See merge request !15
```
by 马力
2019-01-11 12:21:28 +0800
Browse Files
店铺列表增加:新的商家类型选择下拉框，列表增加2列
a6a9e00c

by 邱骏
2019-01-11 10:58:19 +0800
Browse Files

10 Jan, 2019

17 commits

增加身份、余额处理
de3bc8cf

by Lixiaodi
2019-01-10 16:05:34 +0800
Browse Files
fix bug
d5eb006c

by liangyi.chen@yoho.cn
2019-01-10 15:03:45 +0800
Browse Files
添加本地配置
91d88766

by liangyi.chen@yoho.cn
2019-01-10 14:05:43 +0800
Browse Files
fix bug
26c7199c

by liangyi.chen@yoho.cn
2019-01-10 14:04:15 +0800
Browse Files
Merge branch 'dev6.8.5-2899' into test6.8.5
cd40ddba

by LUOXC
2019-01-10 12:37:30 +0800
Browse Files
fix bug
a02bc673

by LUOXC
2019-01-10 12:37:10 +0800
Browse Files
no message
287bc89b

by peuei
2019-01-10 10:59:32 +0800
Browse Files
add config
9a87251c

by peuei
2019-01-10 10:52:03 +0800
Browse Files
Merge branch 'dev_6.8.5_yoho2ufo' into test6.8.5
cc99c2e4

by liangyi.chen@yoho.cn
2019-01-10 10:45:08 +0800
Browse Files
搜索地址修改
e836692b

by liangyi.chen@yoho.cn
2019-01-10 10:43:39 +0800
Browse Files
update
b3f7ce50

by peuei
2019-01-10 10:35:16 +0800
Browse Files
Merge branch 'dev6.8.5-2899' into test6.8.5
e897660d

by LUOXC
2019-01-10 10:32:21 +0800
Browse Files
rename 卖家虚假发货
4950702b

by LUOXC
2019-01-10 10:32:10 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/ufo-platform into test6.8.5
cc3ccb03

by LUOXC
2019-01-10 10:19:39 +0800
Browse Files
Merge branch 'dev6.8.5-2899' into test6.8.5
b9b71971

by LUOXC
2019-01-10 10:17:03 +0800
Browse Files
Merge branch 'dev_6.8.5_yoho2ufo' into test6.8.5
50f9b283

by liangyi.chen@yoho.cn
2019-01-10 10:16:48 +0800
Browse Files
添加违规记录
93c1cbf7

by LUOXC
2019-01-10 10:16:29 +0800
Browse Files