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

This commit is contained in:
Mr.Z
2021-09-26 17:33:47 +08:00
@@ -143,9 +143,11 @@ public class TsUser extends BaseEntity {
private List<TsPosition> positions;
@ApiModelProperty("当前页")
@TableField(exist = false)
private Integer current;
@ApiModelProperty("每页条数")
@TableField(exist = false)
private Integer size;
public TsUser() {