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

wyu

2021-12-28 a75bcc7c2b0fc98bd3a8abc100a4ad4ec11b9c26

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

@@ -35,7 +35,9 @@
            <div ng-show="vm.form.projectManagerYN" 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>
                        <label for="userModifyForm3"><span translate="users.setEmailNotificationTime">이메일 알림 시간 설정</span>
                            <!--<code class="highlighter-rouge">*</code>-->
                        </label>
                        &nbsp;&nbsp;
                        <input class="form-control"
                               type="checkbox"
@@ -46,7 +48,6 @@
                               date-time-picker
                               option="Y"
                               ng-disabled="vm.form.realtimeNotify"
                               ng-required="!vm.form.realtimeNotify"
                               placeholder="이메일 알림 시간을 설정해주세요."
                               ng-model="vm.form.reservationNotifyTime">
                    </div>