ufo / ufo-platform · Commits

15 Apr, 2019

4 commits

Merge branch 'gray' into hotfix_vedio
93aeda65

by mali
2019-04-15 16:40:01 +0800
Browse Files
鉴定视频优化
c6dd148a

by mali
2019-04-15 16:39:14 +0800
Browse Files
鉴定视频优化
adfec294

by mali
2019-04-15 16:38:10 +0800
Browse Files
根据时间查询视频任务返回create_time
ec812454

by mali
2019-04-15 10:03:44 +0800
Browse Files

12 Apr, 2019

5 commits

加日志
222e15be

by mali
2019-04-12 17:28:34 +0800
Browse Files
加操作日志
1c2b12b8

by mali
2019-04-12 16:54:05 +0800
Browse Files
加日志
8a4b8e94

by mali
2019-04-12 16:16:21 +0800
Browse Files
session 超时时间改成 3小时
d1b87490

by mali
2019-04-12 14:52:26 +0800
Browse Files
修改寄件人信息
55afe948

by caoyan
2019-04-12 10:24:25 +0800
Browse Files

10 Apr, 2019

5 commits

Merge branch 'hotfix_0410_内部买家' into test6.9.0 ...
579d76f7
```
# Conflicts:
#	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
```
by qinchao
2019-04-10 16:45:36 +0800
Browse Files
内部买家标识
8815c7f4

by qinchao
2019-04-10 16:04:31 +0800
Browse Files
顺丰物流信息缓存7天
ef73cdc2

by mali
2019-04-10 15:46:43 +0800
Browse Files
Merge branch 'dev_showSearchImage' into test6.9.0
f54b0c24

by 匡佳华
2019-04-10 10:14:25 +0800
Browse Files
品牌页增加品牌搜索大图
9176a680

by 匡佳华
2019-04-10 10:13:59 +0800
Browse Files

09 Apr, 2019

3 commits

sql性能优化
6733cce3

by mali
2019-04-09 18:18:55 +0800
Browse Files
Merge branch 'test6.9.0' of http://git.yoho.cn/ufo/ufo-platform into test6.9.0
f97bcee7

by min.ling
2019-04-09 11:32:53 +0800
Browse Files
fix:订单列表sku筛选项
e8b78728

by min.ling
2019-04-09 11:32:14 +0800
Browse Files

08 Apr, 2019

5 commits

Merge branch 'dev_0408优化平台发货' into test6.9.0
68848069

by qinchao
2019-04-08 18:20:35 +0800
Browse Files
增加字段属性 mapper
99bd960e

by qinchao
2019-04-08 16:33:52 +0800
Browse Files
增加字段属性
e95332e7

by qinchao
2019-04-08 16:33:22 +0800
Browse Files
Merge branch 'dev_0408优化平台发货' into test6.9.0
7a31f721

by qinchao
2019-04-08 15:58:24 +0800
Browse Files
fix ：鉴定统计路径保持一致
a2497cc6

by qinchao
2019-04-08 15:57:33 +0800
Browse Files

04 Apr, 2019

6 commits

Merge branch 'dev_vedio' into test6.9.0
ff823129

by mali
2019-04-04 17:41:09 +0800
Browse Files
鉴定视频优化
7287735e

by mali
2019-04-04 17:31:21 +0800
Browse Files
鉴定视频优化
422a7489

by mali
2019-04-04 17:22:30 +0800
Browse Files
鉴定视频优化
14656ccf

by mali
2019-04-04 17:19:22 +0800
Browse Files
Merge branch 'dev_vedio' into test6.9.0
b14ce405

by mali
2019-04-04 17:08:05 +0800
Browse Files
鉴定视频优化
8b7289e8

by mali
2019-04-04 17:07:52 +0800
Browse Files

03 Apr, 2019

4 commits

Merge branch 'dev_vedio' into test6.9.0
22691e43

by mali
2019-04-03 15:04:02 +0800
Browse Files
鉴定视频优化
748b018d

by mali
2019-04-03 11:04:26 +0800
Browse Files
鉴定视频优化
8945813a

by mali
2019-04-03 10:25:16 +0800
Browse Files
鉴定视频生成的新方案
a34d90f3

by mali
2019-04-03 09:50:45 +0800
Browse Files

02 Apr, 2019

8 commits

Merge branch 'platform_XF' into test6.9.0
e6276586

by DengXinFei
2019-04-02 18:44:07 +0800
Browse Files
状态切换值设定
b46266b0

by DengXinFei
2019-04-02 18:43:27 +0800
Browse Files
添加订单来源筛选
eddf7f15

by DengXinFei
2019-04-02 18:36:52 +0800
Browse Files
添加订单状态，订单类型的筛选
ffc0d838

by DengXinFei
2019-04-02 18:35:17 +0800
Browse Files
版本升级
127fc317

by mali
2019-04-02 13:40:20 +0800
Browse Files
鉴定视频重构
a2dfa7f9

by mali
2019-04-02 10:25:18 +0800
Browse Files
质检
91c75687

by caoyan
2019-04-02 10:21:43 +0800
Browse Files
Merge branch 'master' into platform_XF ...
fd3cf090
```
# Conflicts:
#	dal/src/main/java/com/yoho/order/model/BuyerOrderReq.java
#	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
```
by DengXinFei
2019-04-02 09:47:52 +0800
Browse Files