Merge remote-tracking branch 'origin/test' into test

sys-api-service/src/main/java/com/xy/entity/MsgUserMessage.java

@@ -61,6 +61,6 @@ public class MsgUserMessage implements Serializable {
      */
     @ApiModelProperty(value = "是否弹出显示")
     private Boolean popUp;
-
+    
 
 }