Merge branch 'dev-mobh' into develop

src/main/java/cn/timer/api/bean/admin/AdminAssoTxjlb.java

@@ -41,7 +41,7 @@ public class AdminAssoTxjlb extends Model<AdminAssoTxjlb> {
 	private String content;
 	private String content;
 
 
 	@ApiModelProperty(value = "提醒用户姓名 提醒用户姓名", example = "101")
 	@ApiModelProperty(value = "提醒用户姓名 提醒用户姓名", example = "101")
-	private Integer userName;
+	private String userName;
 
 
 	@ApiModelProperty(value = "提醒用户id 提醒用户id", example = "101")
 	@ApiModelProperty(value = "提醒用户id 提醒用户id", example = "101")
 	private Integer empNum;
 	private Integer empNum;