ufo / ufo-platform · Commits

30 Aug, 2019

15 commits

促销活动：fix
1390d7f5

by 匡佳华
2019-08-30 16:45:42 +0800
Browse Files
Merge branch 'dev_0830_pageSize' into test6.9.11
09ec3c12

by Lixiaodi
2019-08-30 16:11:38 +0800
Browse Files
页面调整
28872a93

by Lixiaodi
2019-08-30 16:11:18 +0800
Browse Files
Merge branch 'dev_0830_pageSize' into test6.9.11
ea8a4a59

by Lixiaodi
2019-08-30 15:55:30 +0800
Browse Files
页面调整
79bcbb83

by Lixiaodi
2019-08-30 15:55:14 +0800
Browse Files
Merge branch 'dev_0830_pageSize' into test6.9.11
cfe5c935

by Lixiaodi
2019-08-30 15:46:01 +0800
Browse Files
页面调整
c223c23d

by Lixiaodi
2019-08-30 15:45:26 +0800
Browse Files
Merge branch 'test6.9.11' of git.yoho.cn:ufo/ufo-platform into test6.9.11
4587dc95

by 周少峰
2019-08-30 14:59:04 +0800
Browse Files
'H
1b0b03ac

by 周少峰
2019-08-30 14:58:45 +0800
Browse Files
merge
29be9094

by 邱骏
2019-08-30 14:20:56 +0800
Browse Files
update
988c4fdb

by 邱骏
2019-08-30 14:19:05 +0800
Browse Files
merge
a1dbb805

by 邱骏
2019-08-30 10:59:16 +0800
Browse Files
fix: 促销折扣
02490a0b

by 匡佳华
2019-08-30 10:54:28 +0800
Browse Files
更新字段
d5460492

by 邱骏
2019-08-30 10:02:06 +0800
Browse Files
促销活动update
6a4720c3

by 匡佳华
2019-08-30 09:28:24 +0800
Browse Files

29 Aug, 2019

2 commits

'timefortmat'
f2d04682

by 周少峰
2019-08-29 17:19:44 +0800
Browse Files
'timeformat'
ac6b6207

by 周少峰
2019-08-29 16:49:07 +0800
Browse Files

28 Aug, 2019

11 commits

资源位增加宽带和搞定
0c74bbaa

by mali
2019-08-28 18:09:19 +0800
Browse Files
Merge branch 'dev_0828_bug_fix' into test6.9.11
1404ce5c

by mali
2019-08-28 16:27:47 +0800
Browse Files
促销活动update：全场商品
2729b7bf

by 匡佳华
2019-08-28 15:42:06 +0800
Browse Files
bug修改
eab91b60

by Lixiaodi
2019-08-28 15:41:10 +0800
Browse Files
NFC转移的
4544a2b3

by mali
2019-08-28 15:10:25 +0800
Browse Files
Merge branch 'test6.9.11' of http://git.yoho.cn/ufo/ufo-platform into test6.9.11
62584661

by tanling
2019-08-28 14:30:40 +0800
Browse Files
需改文案
7be49fbc

by tanling
2019-08-28 14:30:36 +0800
Browse Files
Merge branch 'test6.9.11' of http://git.yoho.cn/ufo/ufo-platform into test6.9.11
2600db49

by mali
2019-08-28 14:07:35 +0800
Browse Files
货架号查询是否重复
c6aeb83f

by mali
2019-08-28 14:07:31 +0800
Browse Files
Merge branch 'test6.9.11' of git.yoho.cn:ufo/ufo-platform into test6.9.11
933d0e55

by 周少峰
2019-08-28 12:14:35 +0800
Browse Files
'db'
72e916c1

by 周少峰
2019-08-28 12:14:11 +0800
Browse Files

27 Aug, 2019

11 commits

促销活动update
cca0a428

by 匡佳华
2019-08-27 20:00:22 +0800
Browse Files
'bann'
7b00d2b2

by 周少峰
2019-08-27 17:56:24 +0800
Browse Files
Merge branch 'test6.9.11' of git.yoho.cn:ufo/ufo-platform into test6.9.11
15afc2f2

by 周少峰
2019-08-27 17:54:52 +0800
Browse Files
'bann'
2d17c027

by 周少峰
2019-08-27 17:54:33 +0800
Browse Files
开关展示
9665f169

by tanling
2019-08-27 17:48:12 +0800
Browse Files
展示开关结果
bd46f16a

by tanling
2019-08-27 17:34:44 +0800
Browse Files
开关展示
2c75bb78

by tanling
2019-08-27 16:46:42 +0800
Browse Files
打款开关
f3407cf0

by tanling
2019-08-27 15:30:19 +0800
Browse Files
增加一个手动开启打款的按钮
3ceb330a

by tanling
2019-08-27 13:45:47 +0800
Browse Files
促销活动update
c72e70b6

by 匡佳华
2019-08-27 11:15:35 +0800
Browse Files
Merge branch 'test6.9.11' into dev-promotionActivity0807 ...
5fc38dd3
```
# Conflicts:
#	pom.xml
```
by 匡佳华
2019-08-27 10:54:22 +0800
Browse Files

26 Aug, 2019

1 commit

Merge branch 'master' into test6.9.11
c287b2e5

by mali
2019-08-26 21:47:24 +0800
Browse Files