Skip to content
This repository was archived by the owner on Mar 15, 2019. It is now read-only.

chengsluo的合并?? #1

Open
wants to merge 86 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
3c0c1a4
test
yahaa Apr 5, 2017
a4f253f
lcc
LeeChangCheng Apr 5, 2017
1727e93
test commit
YoGhurt111 Apr 5, 2017
f32f0aa
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
YoGhurt111 Apr 5, 2017
8171a96
another test
YoGhurt111 Apr 5, 2017
cfb7c9a
chengsluo' commit!
chengsluo Apr 5, 2017
a5ff85c
some Entity by YoGhurt
YoGhurt111 Apr 6, 2017
360888b
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
chengsluo Apr 7, 2017
60c3491
添加样例
yahaa Apr 7, 2017
5733156
lcc2
LeeChangCheng Apr 8, 2017
7c5cd9a
修改后的Chengsluo需要编写的类
chengsluo Apr 9, 2017
e79dc00
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
chengsluo Apr 9, 2017
aaf49a8
Chengsluo 的修改
chengsluo Apr 9, 2017
cb96ae8
first
Dawangdadada Apr 9, 2017
2ac816d
修改错误,chengsluo
chengsluo Apr 10, 2017
2b8231d
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
chengsluo Apr 10, 2017
45af20d
update
yahaa Apr 16, 2017
5a7daeb
update
yahaa Apr 16, 2017
5af686e
second
Dawangdadada Apr 16, 2017
e683cb0
数据库建表
YoGhurt111 Apr 16, 2017
c58b2b4
数据库建表
YoGhurt111 Apr 16, 2017
f1a5697
third
Dawangdadada Apr 16, 2017
e698ba5
Add Datebase Server
chengsluo Apr 22, 2017
a2b3dec
登录验证
YoGhurt111 Apr 22, 2017
e676923
登录和注册
YoGhurt111 Apr 22, 2017
3416010
change cookiename
chengsluo Apr 22, 2017
3e8e69d
Add PVSystem.iml
chengsluo Apr 22, 2017
02961dd
Add Project
chengsluo Apr 22, 2017
40afbf5
updatejj
YoGhurt111 Apr 22, 2017
f9f0379
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
YoGhurt111 Apr 22, 2017
e0bee9b
Add date
chengsluo Apr 22, 2017
610f22e
merge
YoGhurt111 Apr 22, 2017
2fd8741
merge
YoGhurt111 Apr 22, 2017
9788e2d
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
YoGhurt111 Apr 22, 2017
ce7341a
api文档说明
chengsluo Apr 22, 2017
d8e379f
API文档说明
YoGhurt111 Apr 22, 2017
36f260c
four
Dawangdadada Apr 23, 2017
13e45ad
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
Dawangdadada Apr 23, 2017
7f5b478
five
Dawangdadada Apr 23, 2017
7bc9d8d
six
Dawangdadada Apr 23, 2017
4b21fe2
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
chengsluo Apr 24, 2017
ee53416
five
Dawangdadada Apr 26, 2017
a9c0b20
six
Dawangdadada Apr 26, 2017
bb40a7b
seven
Dawangdadada Apr 27, 2017
f0e0725
controller
yahaa Apr 29, 2017
2f2d0eb
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
yahaa Apr 29, 2017
e0ee0d3
update
yahaa Apr 29, 2017
dc90f54
seven
Dawangdadada Apr 29, 2017
4d7a769
yuguo
YoGhurt111 Apr 29, 2017
e231054
登录错误返回信息
YoGhurt111 Apr 29, 2017
a929396
update home2
YoGhurt111 Apr 29, 2017
06d049d
lcc
LeeChangCheng Apr 29, 2017
aa5d218
jjXMerge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
LeeChangCheng Apr 29, 2017
85f8e91
seven
Dawangdadada Apr 29, 2017
857acfd
update
Dawangdadada Apr 29, 2017
99bca5c
update
Dawangdadada Apr 29, 2017
7d01262
注册功能
YoGhurt111 Apr 29, 2017
19819b9
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
YoGhurt111 Apr 29, 2017
b36172d
lcc
LeeChangCheng Apr 29, 2017
a4e68e8
updata
Dawangdadada Apr 29, 2017
2dde7c7
update
Dawangdadada Apr 29, 2017
862ebd7
update
Dawangdadada Apr 30, 2017
bdd072f
update
Dawangdadada Apr 30, 2017
c590680
修改页面导航
yahaa Apr 30, 2017
d651c1f
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
yahaa Apr 30, 2017
9c139ae
update
Dawangdadada Apr 30, 2017
bff2c96
新建项目接口
yahaa Apr 30, 2017
7445a85
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
yahaa Apr 30, 2017
45a03a8
api 说明
yahaa Apr 30, 2017
5d98e13
任务安排
yahaa Apr 30, 2017
e5d23fc
update
Dawangdadada Apr 30, 2017
f9b3ebc
merge
YoGhurt111 Apr 30, 2017
a662aab
merge
YoGhurt111 Apr 30, 2017
d87830b
update
Dawangdadada May 1, 2017
1cde340
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
YoGhurt111 May 1, 2017
7e451b2
service层的编写
YoGhurt111 May 1, 2017
1b2537c
lcc
LeeChangCheng May 2, 2017
0e09a72
update
Dawangdadada May 6, 2017
8cf9110
12.31lcc
LeeChangCheng May 6, 2017
7b5fbec
update
Dawangdadada May 6, 2017
829f945
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
Dawangdadada May 6, 2017
a07f544
Add Component Interface
chengsluo May 6, 2017
b4987ef
Add Component Interface need Argumes
chengsluo May 6, 2017
aa34637
update
Dawangdadada May 6, 2017
38fc0dc
m
LeeChangCheng May 10, 2017
293a61b
Merge branch 'dev' of github.com:SHU-PV-Blue/PVSystem into dev
LeeChangCheng May 10, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
target
.idea/workspace.xml
.idea/dataSources
.idea/sqldialects.xml
.idea/dataSources.local.xml
.idea/dataSources.xml
.idea/kotlinc.xml
.idea/misc.xml
.idea/uiDesigner.xml
.idea/libraries
src/main/resources/jdbc.properties
src/test
2 changes: 0 additions & 2 deletions .gitignore~

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__antlr_antlr_2_7_7.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_fasterxml_classmate_1_3_0.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__commons_io_commons_io_2_2.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__commons_pool_commons_pool_1_6.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__dom4j_dom4j_1_6_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__javax_annotation_jsr250_api_1_0.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__javax_el_el_api_2_2.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__javax_enterprise_cdi_api_1_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__javax_inject_javax_inject_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_2.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__javax_servlet_jstl_1_2.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__junit_junit_4_12.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__log4j_log4j_1_2_17.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__mysql_mysql_connector_java_5_1_35.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_3.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_aspectj_aspectjweaver_1_7_4.xml

This file was deleted.

This file was deleted.

Loading