Merge remote-tracking branch 'origin/jenkins_with_weblogic' into jenkins_with_weblogic

# Conflicts:
#	src/main/java/com/eactive/eai/rms/onl/manage/control/control/ControlApiController.java
This commit is contained in:
Rinjae
2026-01-30 16:59:31 +09:00
@@ -18,7 +18,6 @@ public class ControlApiController extends BaseRestController {
this.controlManController = controlManController;
}
@RequestMapping(value = "/onl/admin/control/controlMan.json", params = "cmd=LIST")
public ModelAndView selectList(HttpServletRequest request, ControlManUISearch uiSearch) {
return controlManController.selectList(request, uiSearch);