p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git

This commit is contained in:
rzs840707 2014-06-20 14:55:43 +08:00
parent 0b0ff00a09 e0b9a1be12
commit 40703e0935
7 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bench4Q-Web/src/main/webapp/lib/chrisma/css/bootstrap-cerulean.css vendored
View File

@ -1,4 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Karla|Ubuntu);
@import url(http:///fonts.useso.com/css?family=Karla|Ubuntu);
/*!
* Bootstrap v2.0.4
*

2
Bench4Q-Web/src/main/webapp/lib/chrisma/css/bootstrap-cyborg.css vendored
View File

@ -1,4 +1,4 @@
@import url('http://fonts.googleapis.com/css?family=Droid+Sans:400,700');
@import url('http:///fonts.useso.com/css?family=Droid+Sans:400,700');
/*!
* Bootstrap v2.0.4
*

2
Bench4Q-Web/src/main/webapp/lib/chrisma/css/bootstrap-journal.css vendored
View File

@ -1,4 +1,4 @@
@import url('http://fonts.googleapis.com/css?family=Open+Sans:400,700');
@import url('http:///fonts.useso.com/css?family=Open+Sans:400,700');
/*!
* Bootstrap v2.0.4
*

2
Bench4Q-Web/src/main/webapp/lib/chrisma/css/bootstrap-redy.css vendored
View File

@ -1,4 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Karla|Ubuntu);
@import url(http:///fonts.useso.com/css?family=Karla|Ubuntu);
/*!
* Bootstrap v2.0.4
*

2
Bench4Q-Web/src/main/webapp/lib/chrisma/css/bootstrap-united.css vendored
View File

@ -1,4 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Ubuntu);
@import url(http:///fonts.useso.com/css?family=Ubuntu);
/*!
* Bootstrap v2.0.4
*

2
Bench4Q-Web/src/main/webapp/lib/chrisma/css/charisma-app.css
View File

@ -1,4 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Shojumaru);
@import url(http:///fonts.useso.com/css?family=Shojumaru);
select{
background-color:#fff;

29
Bench4Q-Web/src/test/java/org/bench4q/web/test/masterMessager/ParamInfoModel_Test.java Normal file
View File

@ -0,0 +1,29 @@
package org.bench4q.web.test.masterMessager;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class ParamInfoModel_Test {
private String label;
private String name;
@XmlElement
public String getLabel() {
return label;
}
public void setLable(String label) {
this.label = label;
}
@XmlElement
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}