Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

wyu

2021-12-28 83cd0465401d56c630611e03ca1e010eb94c1eb6

 src/main/webapp/scripts/app/user/userModify.controller.js

@@ -89,7 +89,7 @@
                            if(result.data.data.reservationNotifyTime === "realTime"){
                                $scope.vm.form.realtimeNotify = true;
                            }else{
                                $scope.vm.form.reservationNotifyTime = result.data.data.reservationNotifyTime;
                                $scope.vm.form.reservationNotifyTime = "";
                            }
                        }
                        else {