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

wyu

2021-12-03 45ae96886e71ba5f9b7865461b890f2e0e2a9f41

 src/main/webapp/views/user/userModify.html

@@ -32,7 +32,7 @@
                </div>
            </div>

            <div class="row">
            <div ng-show="" class="row">
                <div class="col-sm-6">
                    <div class="form-group">
                        <label for="userModifyForm3"><span translate="users.setEmailNotificationTime">이메일 알림 시간 설정</span> <code class="highlighter-rouge">*</code></label>
@@ -47,6 +47,7 @@
                               option="Y"
                               ng-disabled="vm.form.realtimeNotify"
                               ng-required="!vm.form.realtimeNotify"
                               placeholder="이메일 알림 시간을 설정해주세요."
                               ng-model="vm.form.reservationNotifyTime">
                    </div>
                </div>