From 43a910170d8049ef99ba38cc2a81b99cad89fb0d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 15:59:17 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/condition/DepartmentManageCondition.java b/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
similarity index 84%
rename from src/main/java/kr/wisestone/owl/web/condition/DepartmentManageCondition.java
rename to src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
index 811d9f4..b0add88 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/DepartmentManageCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
@@ -7,7 +7,7 @@
/**
* Created by wyu on 2021-11-05.
*/
-public class DepartmentManageCondition {
+public class DepartmentCondition {
private Long id;
private String departmentName;
private String departmentDescription;
@@ -16,8 +16,8 @@
private Integer Page;
private Integer PageSize;
- public static DepartmentManageCondition make(Map<String, Object> departmentManageConditions) {
- return ConvertUtil.convertMapToClass(departmentManageConditions, DepartmentManageCondition.class);
+ public static DepartmentCondition make(Map<String, Object> departmentConditions) {
+ return ConvertUtil.convertMapToClass(departmentConditions, DepartmentCondition.class);
}
public Long getId() {
--
Gitblit v1.8.0