Merge branch 'dev-mobh' into develop

edf0762b · mobh · d4ec43ab · 3350714e · edf0762b
Commit edf0762b authored Nov 11, 2020 by mobh
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/main/java/cn/timer/api/bean/admin/AdminAssoTxjlb.java
+1 -1

No files found.
--- a/src/main/java/cn/timer/api/bean/admin/AdminAssoTxjlb.java
+++ b/src/main/java/cn/timer/api/bean/admin/AdminAssoTxjlb.java
@@ -41,7 +41,7 @@ public class AdminAssoTxjlb extends Model<AdminAssoTxjlb> {
 	private String content;

 	@ApiModelProperty(value = "提醒用户姓名 提醒用户姓名", example = "101")
-	private Integer userName;
+	private String userName;

 	@ApiModelProperty(value = "提醒用户id 提醒用户id", example = "101")
 	private Integer empNum;