合并 fix bugs

BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java

@@ -23,7 +23,7 @@ public class UserInfo extends BaseEvent implements Serializable {
     public static final String FEMALE = "2";
     public static final String MALE = "1";
     private int id;
-    private int user_id; //用户id
+    private int user_id = 0; //用户id
     private String user_code;//用户id码
     private String avatar;//头像
     private String nickname;//昵称

BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomPitBean.java

@@ -28,13 +28,21 @@ public class RoomPitBean implements Serializable {
      * dress_picture :
      */
 
+    public RoomPitBean(){
+
+    }
+
+    public RoomPitBean(String pit_number){
+        this.pit_number = pit_number;
+    }
+
     private String id;//id
     private String pit_number="";//麦位号
     private String state;//麦位状态 正常 ，1封麦；3禁麦
     private int is_lock;//0未锁麦 1锁麦
     private int is_mute;//0未禁麦 1禁麦
     private int count_down;//麦位倒计时
-    private String user_id="";//麦位上用户id
+    private String user_id="0";//麦位上用户id
     private String nickname;//麦位上用户昵称
     private String avatar;//用户头像
     private String sex;//性别