Merge branch 'refs/heads/jxl-slime' into test-ecs

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/edit.html

@@ -47,6 +47,12 @@
                 <input name="sex" class="form-control" type="text" th:if="*{sex==2}" th:value="女" readonly required>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">民族：</label>
+            <div class="col-sm-8">
+                <input name="nation" class="form-control" type="text" th:value="*{nation}" readonly required>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">学校：</label>
             <div class="col-sm-8">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/list.html

@@ -107,6 +107,10 @@
                     field: 'sex',
                     title: '性别'
                 },
+                {
+                    field: 'nation',
+                    title: '民族'
+                },
                 {
                     field: 'phone',
                     title: '手机号'