Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	app/app-iot-server/pom.xml

common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyDO.java

@@ -54,6 +54,8 @@ public class IotCompanyDO extends IdEntityWithOperation implements Serializable
    private String contactsIdcardImg;//联系人身份证照片
    @Column(name = "account")
    private String account;//账号
    @Column(name = "ehr_user_id")
    private String ehrUserId;//    ehr用户id，修改密码时使用
    @Column(name = "del")
    private Integer del;//删除标志(1有效，0删除)
@@ -204,6 +206,14 @@ public class IotCompanyDO extends IdEntityWithOperation implements Serializable
        this.account = account;
    }
    public String getEhrUserId() {
        return ehrUserId;
    }
    public void setEhrUserId(String ehrUserId) {
        this.ehrUserId = ehrUserId;
    }
    public Integer getDel() {
        return del;
    }

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@@ -70,6 +70,7 @@ public class IotRequestMapping {
        public static final String findCompanyCertById = "findCompanyCertById";
        public static final String findCompanyCertByCompanyId = "findCompanyCertByCompanyId";
        public static final String addCompanyCert = "addCompanyCert";
        public static final String changePassWord = "changePassWord";
        public static final String api_create = "company";
        public static final String api_delete = "company";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/company/IotCompanyVO.java

@@ -54,7 +54,10 @@ public class IotCompanyVO extends BaseVO implements Serializable {
    private String contactsIdcardImg;
    @ApiModelProperty("账号")
    private String account;
    @ApiModelProperty("密码")
    private String password;
    @ApiModelProperty("ehr用户id，修改密码时使用")
    private String ehrUserId;
    @ApiModelProperty("类型")
    private List<IotCompanyTypeVO> typeList;
@@ -201,4 +204,20 @@ public class IotCompanyVO extends BaseVO implements Serializable {
    public void setTypeList(List<IotCompanyTypeVO> typeList) {
        this.typeList = typeList;
    }
    public String getPassword() {
        return password;
    }
    public void setPassword(String password) {
        this.password = password;
    }
    public String getEhrUserId() {
        return ehrUserId;
    }
    public void setEhrUserId(String ehrUserId) {
        this.ehrUserId = ehrUserId;
    }
}