fangyeqing / xkl-interface · Commits

18 Feb, 2017

8 commits

Merge branch 'zhaoyue-dev' into 'master' ...
b67f06a6
```
Zhaoyue dev



See merge request !9
```
by zhaoyue
2017-02-18 20:24:33 +0800
Browse Files
Merge branch 'zhaoyue-dev' of gitlab.hanhezy.com:fyq/xkl-web into zhaoyue-dev
acfb2590

by zhaoyue
2017-02-18 20:19:32 +0800
Browse Files
ADD code for uspih
7af97ae4

by zhaoyue
2017-02-18 20:19:08 +0800
Browse Files
ADD code for uspih
22060528

by zhaoyue
2017-02-18 18:39:11 +0800
Browse Files
ADD code for uspih
7d3641ba

by zhaoyue
2017-02-18 18:28:09 +0800
Browse Files
ADD code for uspih
1405e790

by zhaoyue
2017-02-18 18:26:51 +0800
Browse Files
ADD code for uspih
1ef17120

by zhaoyue
2017-02-18 18:24:20 +0800
Browse Files
ADD code for uspih
786a0fd3

by zhaoyue
2017-02-18 16:28:07 +0800
Browse Files

25 Jan, 2017

1 commit

Update start.sh
86313f00

by fangyeqing
2017-01-25 11:56:44 +0800
Browse Files

19 Jan, 2017

5 commits

Merge branch 'master' of gitlab.hanhezy.com:fyq/xkl-web
5ecc274c

by fangyeqing
2017-01-20 01:07:59 +0800
Browse Files
ADD log and FIX some bug
35ce05dc

by fangyeqing
2017-01-20 01:03:16 +0800
Browse Files
Merge branch 'zhaoyue-dev4' into 'master' ...
212503ab
```
Zhaoyue dev4



See merge request !7
```
by zhaoyue
2017-01-20 00:08:40 +0800
Browse Files
Fix little points
52133740

by zhaoyue
2017-01-20 00:07:06 +0800
Browse Files
Fix little points
12c035de

by zhaoyue
2017-01-20 00:02:19 +0800
Browse Files

15 Jan, 2017

5 commits

Fix some bugs
cdc8e568

by fangyeqing
2017-01-16 00:38:36 +0800
Browse Files
FIX:fix bug
2c98c0e1

by fangyeqing
2017-01-15 20:34:42 +0800
Browse Files
Fix:fix bugs
5e722330

by fangyeqing
2017-01-15 20:23:39 +0800
Browse Files
Merge branch 'zhaoyue-dev3' into 'master' ...
bd329d80
```
Fix names

删除了一些重复的entity文件，对相应功能做了合并。

See merge request !6
```
by zhaoyue
2017-01-15 11:42:00 +0800
Browse Files
Fix names
0e2f4bf5

by zhaoyue
2017-01-15 11:36:59 +0800
Browse Files

14 Jan, 2017

5 commits

Fix little bug
d1f929ee

by zhaoyue
2017-01-14 22:28:16 +0800
Browse Files
Upsoft pass testing, fix little bug
c72eee55

by zhaoyue
2017-01-14 21:49:14 +0800
Browse Files
Upsoft pass testing, fix little bug
03b06cf4

by zhaoyue
2017-01-14 21:44:56 +0800
Browse Files
Upsoft pass testing
856bd386

by zhaoyue
2017-01-14 21:41:47 +0800
Browse Files
FIX some conflicts
7c806212

by zhaoyue
2017-01-14 15:27:14 +0800
Browse File »

07 Jan, 2017

4 commits

FIX:fix sign
71473bfc

by fangyeqing
2017-01-07 15:09:52 +0800
Browse Files
FIX:fix bug without innerkey
6d1efda3

by fangyeqing
2017-01-07 14:42:44 +0800
Browse Files
ADD:bin/start-https.sh
f95efdd2

by fangyeqing
2017-01-07 11:44:44 +0800
Browse Files
ADD:start https
ce50345d

by fangyeqing
2017-01-07 11:40:47 +0800
Browse Files

02 Jan, 2017

6 commits

Update README.md
0020d0fc

by fangyeqing
2017-01-02 22:18:57 +0800
Browse Files
MOD:mod readme
b6d188c4

by fangyeqing
2017-01-02 22:17:32 +0800
Browse Files
ADD:添加启动停止脚本
a2457980

by fangyeqing
2017-01-02 22:12:43 +0800
Browse Files
ADD:add readme
37da82f7

by fangyeqing
2017-01-02 21:46:46 +0800
Browse Files
FIX:fix bug without main class
c60db910

by fangyeqing
2017-01-02 21:33:45 +0800
Browse Files
FIX:fix some bugs
b4483205

by fangyeqing
2017-01-02 21:18:51 +0800
Browse Files

19 Dec, 2016

1 commit

ADD:add openid login interface
b958c1f3

by fangyeqing
2016-12-19 23:27:50 +0800
Browse Files

18 Dec, 2016

1 commit

ADD:git openid bind interface
c5243cec

by fangyeqing
2016-12-18 22:42:43 +0800
Browse Files

12 Dec, 2016

2 commits

ADD:add reportItemGraph interface
6fcf29db

by fangyeqing
2016-12-13 00:41:43 +0800
Browse Files
ADD:add reportdetail interface and itemInfo interface
09b715a5

by fangyeqing
2016-12-12 23:03:36 +0800
Browse Files

04 Dec, 2016

2 commits

Merge branch 'zhaoyue-dev2' into 'master' ...
c7a8af8a
```
MOD move some code from controller to service



See merge request !4
```
by zhaoyue
2016-12-04 16:33:59 +0800
Browse Files
FIX some conflicts
11fdfac6

by zhaoyue
2016-12-04 16:30:55 +0800
Browse Files