Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/User.java

@@ -54,6 +54,12 @@ public class User extends Model<User> {
     @TableField("password")
     private String password;
 
+    /**
+     * 性别
+     */
+    @TableField("gender")
+    private String gender;
+
     /**
      * 头像图片地址
      */

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/groupView/info.vue

@@ -4,10 +4,10 @@
         <div style="margin-top: 44px;">
             <van-list :finished="true">
                 <van-cell  title="员工名称" ><div>{{ user.name }}</div></van-cell>
-                <van-cell  title="工种" ><div>{{ user.jobNumber }}</div></van-cell>
-                <van-cell  title="工号" ><div>{{ user.workType }}</div></van-cell>
+                <van-cell  title="工种" ><div>{{  user.workType }}</div></van-cell>
+                <van-cell  title="工号" ><div>{{ user.jobNumber }}</div></van-cell>
                 <van-cell  title="手机号码" ><div>{{ user.phone }}</div></van-cell>
-                <van-cell  title="性别" ><div>{{ user.gender==1?'男':'女' }}</div></van-cell>
+                <van-cell  title="性别" ><div>{{ user.gender == 1 ?'男':'女' }}</div></van-cell>
             </van-list>
         </div>