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

doum

昨天 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

 server/system_service/src/main/java/com/doumee/dao/system/dto/UpdatePwdDto.java

@@ -1,12 +1,11 @@
package com.doumee.dao.system.dto;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.service.business.third.model.LoginUserInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;

/**