Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/css/media.css
This commit is contained in:
com02 2021-11-19 16:10:21 +09:00
commit 3c6e71fa6b
2 changed files with 2112 additions and 1 deletions

View File

@ -161,7 +161,40 @@ public class CollectionVO extends PagingVO {
//---------------------------------------------
protected String deptNm; /* 관리부서이름 */
protected String domainHostNm; /* 관리부서 호스트주소 */
// 생성자
//---------------------------------------------
// 각종 상태 제공 서비스
//---------------------------------------------
public boolean canRead() {
return true;
}
public boolean canRent() {
return true;
}
public boolean canOnline() {
return true;
}
public boolean canReadNow() {
return true;
}
public boolean canRentNow() {
return canRentAppNow() || canRentResNow();
}
public boolean canRentAppNow() {
return true;
}
public boolean canRentResNow() {
return true;
}
public boolean canOnlineNow() {
return true;
}
//---------------------------------------------
// 생성자
//---------------------------------------------
public CollectionVO() {
super();
}

File diff suppressed because it is too large Load Diff