ufo / ufo-platform · Commits

14 Jan, 2019

2 commits

redis统一用ufo的redis
ac23e7c8

by mali
2019-01-14 15:51:33 +0800
Browse Files
质检开始
92f50fb1

by qinchao
2019-01-14 13:49:58 +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

22 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
有货融入ufo商品配置
a5ed7a3f

by liangyi.chen@yoho.cn
2019-01-10 10:14:18 +0800
Browse Files
Merge branch 'dev_上传营业执照' into test6.8.5
9790d4f3

by caoyan
2019-01-10 10:02:34 +0800
Browse Files
营业执照
5b093be6

by caoyan
2019-01-10 10:02:25 +0800
Browse Files
Merge branch 'dev_上传营业执照' into test6.8.5 ...
654491e5
```
# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by caoyan
2019-01-10 09:59:17 +0800
Browse Files
营业执照
897774e1

by caoyan
2019-01-10 09:56:54 +0800
Browse Files

09 Jan, 2019

11 commits

fix 门店商品吊牌打印接口
33371e5f

by peuei
2019-01-09 19:49:36 +0800
Browse Files
营业执照
53c1f30b

by caoyan
2019-01-09 18:22:04 +0800
Browse Files
update
aa017efe

by 邱骏
2019-01-09 17:28:25 +0800
Browse Files
Merge branch 'dev6.8.5-2899' into test6.8.5
b09649f9

by LUOXC
2019-01-09 10:31:51 +0800
Browse Files
refacotr
d91ddb74

by LUOXC
2019-01-09 10:31:38 +0800
Browse Files
refacotr
7984a1c1

by LUOXC
2019-01-09 10:15:32 +0800
Browse Files
Merge branch 'dev6.8.5-2899' into test6.8.5
604e81eb

by LUOXC
2019-01-09 10:07:35 +0800
Browse Files
add confirm
540f2eca

by LUOXC
2019-01-09 10:06:15 +0800
Browse Files
营业执照
82618ce7

by caoyan
2019-01-09 09:45:52 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/ufo-platform into test6.8.5
5f0bf6f5

by mali
2019-01-09 09:36:17 +0800
Browse Files
价格走势
c2e086c4

by mali
2019-01-09 09:36:12 +0800
Browse Files

08 Jan, 2019

3 commits

添加客服取消订单
f2343135

by LUOXC
2019-01-08 21:27:19 +0800
Browse Files
Merge branch 'hotfix_修改比价定时' into test6.8.5
c7e01ad2

by mali
2019-01-08 17:39:13 +0800
Browse Files
将比价更新到15分钟一次
e7b43d67

by mali
2019-01-08 17:39:05 +0800
Browse Files