Merge remote-tracking branch 'origin/master'

jhjang

2021-12-14 fe2b018f2c33d4444ed8a9c731f78e8f9ec6aadc

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

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

            <div ng-show="" class="row">
            <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>