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

# Conflicts:
#	svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/util/ISqlUtils.java

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/AccountDO.java

@@ -26,7 +26,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
    private String accountName;//账户名
    @Column(name = "total")
    private int total;//积分总数
    private Integer total;//积分总数
    @Column(name = "password")
    private String password;//密码
@@ -50,7 +50,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
    private Long sum;//总积分（已用积分和剩余积分）
    @Transient
    private int usedTotal;//已用积分
    private Integer usedTotal;//已用积分
    @Transient
    private Long nowTotal;//今日获取积分
@@ -62,10 +62,10 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
    private Long taskTotal;//参与任务数;
    @Transient
    private int teamRanking;//团队排名
    private Integer teamRanking;//团队排名
    @Transient
    private int cityRanking;//全市排名
    private Integer cityRanking;//全市排名
    @Transient
    private List<String> patientIds;//团队居民id
@@ -103,11 +103,11 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.accountName = accountName;
    }
    public int getTotal() {
    public Integer getTotal() {
        return total;
    }
    public void setTotal(int total) {
    public void setTotal(Integer total) {
        this.total = total;
    }
@@ -119,11 +119,11 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.hospital = hospital;
    }
    public int getUsedTotal() {
    public Integer getUsedTotal() {
        return usedTotal;
    }
    public void setUsedTotal(int usedTotal) {
    public void setUsedTotal(Integer usedTotal) {
        this.usedTotal = usedTotal;
    }
@@ -183,19 +183,19 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.taskTotal = taskTotal;
    }
    public int getTeamRanking() {
    public Integer getTeamRanking() {
        return teamRanking;
    }
    public void setTeamRanking(int teamRanking) {
    public void setTeamRanking(Integer teamRanking) {
        this.teamRanking = teamRanking;
    }
    public int getCityRanking() {
    public Integer getCityRanking() {
        return cityRanking;
    }
    public void setCityRanking(int cityRanking) {
    public void setCityRanking(Integer cityRanking) {
        this.cityRanking = cityRanking;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ActivityDO.java

@@ -78,7 +78,7 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
    private Long total;//参加总数
    @Transient
    private int activityRanking;//活动中的排名
    private Integer activityRanking;//活动中的排名
    @Transient
    private List<TaskPatientDetailDO> taskPatientDetailDOS;//参与活动详情
@@ -252,11 +252,11 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.patientIdcard = patientIdcard;
    }
    public int getActivityRanking() {
    public Integer getActivityRanking() {
        return activityRanking;
    }
    public void setActivityRanking(int activityRanking) {
    public void setActivityRanking(Integer activityRanking) {
        this.activityRanking = activityRanking;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/CreditsDetailDO.java

@@ -25,13 +25,13 @@ public class CreditsDetailDO extends IdEntityWithOperation implements Serializab
    private String transactionId;//业务ID
    @Column(name="integrate")
    private int integrate;//积分
    private Integer integrate;//积分
    @Column(name = "status")
    private int status;//状态（有效/无效）
    private Integer status;//状态（有效/无效）
    @Column(name = "trade_direction")
    private int tradeDirection;//交易方向
    private Integer tradeDirection;//交易方向
    @Column(name = "account_id")
    private String accountId;//账户id
@@ -88,19 +88,19 @@ public class CreditsDetailDO extends IdEntityWithOperation implements Serializab
        this.saasId = saasId;
    }
    public int getIntegrate() {
    public Integer getIntegrate() {
        return integrate;
    }
    public void setIntegrate(int integrate) {
    public void setIntegrate(Integer integrate) {
        this.integrate = integrate;
    }
    public int getStatus() {
    public Integer getStatus() {
        return status;
    }
    public void setStatus(int status) {
    public void setStatus(Integer status) {
        this.status = status;
    }
@@ -128,11 +128,11 @@ public class CreditsDetailDO extends IdEntityWithOperation implements Serializab
        this.hospital = hospital;
    }
    public int getTradeDirection() {
    public Integer getTradeDirection() {
        return tradeDirection;
    }
    public void setTradeDirection(int tradeDirection) {
    public void setTradeDirection(Integer tradeDirection) {
        this.tradeDirection = tradeDirection;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskPatientDetailDO.java

@@ -19,7 +19,7 @@ public class TaskPatientDetailDO extends IdEntityWithOperation implements Serial
    private String saasId; //saasid
    @Column(name = "status")
    private int status;//任务完整状态：1完成，0参与，-1作废
    private Integer status;//任务完整状态：1完成，0参与，-1作废
    @Column(name = "patient_id")
    private String patientId;//居民id
@@ -49,7 +49,7 @@ public class TaskPatientDetailDO extends IdEntityWithOperation implements Serial
    private AccountDO accountDO;//账户信息
    @Transient
    private int isFlag;//标识是否为当前用户
    private Integer isFlag;//标识是否为当前用户
    @Transient
    private String taskCode;//任务标识
@@ -62,11 +62,11 @@ public class TaskPatientDetailDO extends IdEntityWithOperation implements Serial
        this.saasId = saasId;
    }
    public int getStatus() {
    public Integer getStatus() {
        return status;
    }
    public void setStatus(int status) {
    public void setStatus(Integer status) {
        this.status = status;
    }
@@ -142,11 +142,11 @@ public class TaskPatientDetailDO extends IdEntityWithOperation implements Serial
        this.unionId = unionId;
    }
    public int getIsFlag() {
    public Integer getIsFlag() {
        return isFlag;
    }
    public void setIsFlag(int isFlag) {
    public void setIsFlag(Integer isFlag) {
        this.isFlag = isFlag;
    }