Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -373,13 +373,13 @@
                         </form:select>
                     </div>
                 </div>
-                <%--<div class="layui-item layui-col-sm6 lw7">--%>
-                    <%--<label class="layui-form-label"><span class="require-item">*</span>职    级：</label>--%>
-                    <%--<div class="layui-input-block with-icon">--%>
-                        <%--<sys:treeselectJobGrade id="jobGrade" name="jobGrade.id" value="${workStaffBasicInfo.jobGrade.id}" labelName="jobGrade.name" labelValue="${workStaffBasicInfo.jobGrade.name}"--%>
-                                                <%--title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>--%>
-                    <%--</div>--%>
-                <%--</div>--%>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>职    级：</label>
+                    <div class="layui-input-block with-icon">
+                        <sys:treeselectJobGrade id="jobGrade" name="jobGrade.id" value="${workStaffBasicInfo.jobGrade.id}" labelName="jobGrade.name" labelValue="${workStaffBasicInfo.jobGrade.name}"
+                                                title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>基本工资：</label>
                     <div class="layui-input-block with-icon">