Merge branch 'wdz' into 'develop'

Wdz

See merge request 8timerv2/8timerapiv200!20

src/main/java/cn/timer/api/dto/qyzx/EntRegisterDto.java

@@ -32,12 +32,15 @@ public class EntRegisterDto implements Serializable {
 	private String sendDate;
 	
 	@ApiModelProperty(value = "验证码 ", example = "666666")
-	private Integer code;
+	private String code;
 	
 	@ApiModelProperty(value = "1.验证码 2.消息推送 3通知提醒 ", example = "1")
 	private Integer messageType;
 
 	@ApiModelProperty(value = "短信模板：1.身份验证验证码 2.登录确认验证码  3.登录异常验证码  4.用户注册验证码 5.修改密码验证码  6.信息变更验证码 ", example = "1")
 	private Integer tc;
- 
+	
+	@ApiModelProperty(value = "1.验证码修改密码 2.原密码修改密码 ", example = "1")
+	private Integer pwUpdateType;
+	
 }