diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index 580185f..02245f0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -32,30 +32,6 @@
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">手机号码：</label>
-                        <div class="col-sm-8">
-                            <div class="input-group">
-                                <input id="phonenumber"  name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11">
-                                <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">邮箱：</label>
-                        <div class="col-sm-8">
-                            <div class="input-group">
-                                <input id="email" name="email"  class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱">
-                                <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
@@ -93,13 +69,12 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">健康状况：</label>
+                        <label class="col-sm-4 control-label is-required">身份证号码：</label>
                         <div class="col-sm-8">
-                            <input name="helthy" class="form-control" type="text">
+                            <input name="cerno" placeholder="请输入身份证号码" class="form-control" type="text" maxlength="30" required isIdentity>
                         </div>
                     </div>
                 </div>
-                <input type="hidden" id="status">
             </div>
             <div class="row">
             	<div class="col-sm-6">
@@ -144,6 +119,30 @@
                     </div>
                 </div>
             </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">手机号码：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group">
+                                <input id="phonenumber"  name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11">
+                                <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">邮箱：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group">
+                                <input id="email" name="email"  class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱">
+                                <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
@@ -234,10 +233,10 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-12">
+                <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-2 control-label is-required">保密协议签订书：</label>
-                        <div class="fileinput fileinput-new col-sm-10" data-provides="fileinput">
+                        <label class="col-sm-4 control-label is-required">保密协议签订书：</label>
+                        <div class="fileinput fileinput-new col-sm-8" data-provides="fileinput">
                         <span class="btn btn-white btn-file">
                             <span class="fileinput-new">选择文件</span>
                             <span class="fileinput-exists">更改</span>
@@ -250,11 +249,16 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">健康状况：</label>
+                        <div class="col-sm-8">
+                            <input name="helthy" class="form-control" type="text">
+                        </div>
+                    </div>
+                </div>
+                <input type="hidden" id="status">
             </div>
-
-
-
-
             <h4 class="form-header h4">其他信息</h4>
             <div class="row">
                 <div class="col-sm-12">
@@ -329,6 +333,9 @@
                         }
                     }
         		},
+                cerno:{
+                    isIdentity18:true,
+                },
         	},
         	messages: {
                 "loginName": {
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
index eeabf22..a2f351a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -36,33 +36,17 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">手机号码：</label>
-                        <div class="col-sm-8">
-                            <div class="input-group">
-                                <input name="phonenumber"  placeholder="请输入手机号码" class="form-control" type="text" maxlength="11" th:field="*{phonenumber}">
-                                <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">邮箱：</label>
+                        <label class="col-sm-4 control-label is-required">登录账号：</label>
                         <div class="col-sm-8">
-                            <div class="input-group">
-                                <input name="email"  class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱" th:field="*{email}">
-                                <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
-                            </div>
+                            <input class="form-control" required type="text" readonly="true" th:field="*{loginName}"/>
                         </div>
                     </div>
                 </div>
-            </div>
-            <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">登录账号：</label>
+                        <label class="col-sm-4 control-label is-required">身份证号码：</label>
                         <div class="col-sm-8">
-                            <input class="form-control" required type="text" readonly="true" th:field="*{loginName}"/>
+                            <input name="cerno" placeholder="请输入身份证号码" class="form-control" type="text" maxlength="30" th:field="*{cerno}" required isIdentity>
                         </div>
                     </div>
                 </div>
@@ -132,6 +116,30 @@
                     </div>
                 </div>
             </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">手机号码：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group">
+                                <input name="phonenumber"  placeholder="请输入手机号码" class="form-control" type="text" maxlength="11" th:field="*{phonenumber}">
+                                <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">邮箱：</label>
+                        <div class="col-sm-8">
+                            <div class="input-group">
+                                <input name="email"  class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱" th:field="*{email}">
+                                <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
@@ -281,6 +289,9 @@
                         }
                     }
         		},
+                cerno:{
+                    isIdentity18:true,
+                },
         	},
         	messages: {
         		"email": {