Merge branch 'ijkdev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	app/app-iot-server/pom.xml
#	app/app-iot-server/src/main/java/com/yihu/ehr/iot/AppIotServer.java
#	app/app-iot-server/src/main/java/com/yihu/iot/controller/common/LoginController.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/config/EhrWebHttpSessionConfiguration.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/config/EhrWebSecurityConfiguration.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAccessDecisionManager.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAuthenticationFailureHandler.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAuthenticationToken.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUserDetails.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUserDetailsService.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUsernamePasswordAuthenticationFilter.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/entryPoint/LoginEntryPoint.java
#	app/app-iot-server/src/main/resources/application.yml
#	app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebAuthenticationProvider.java
#	app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebAuthenticationSuccessHandler.java
#	app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebContextLogoutHandler.java
#	app/public-health-server/src/main/java/com/yihu/health/util/CurrentRequest.java
#	svr/svr-base/src/main/resources/application.yml
#	web-gateway/src/main/java/com/yihu/jw/controller/base/login/LoginContorller.java
#	web-gateway/src/main/resources/application.yml

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

@@ -7,6 +7,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by wang zhinan on 2018/4/27.
@@ -93,6 +94,9 @@ public class CreditsDetailDO extends UuidIdentityEntityWithOperator implements S
    @Transient
    private ExchangeGoodsDO exchangeGoodsDO;//兑换商品
    @Transient
    private String uploadTime; //上传时间
    @Column(name = "saas_id")
@@ -327,4 +331,12 @@ public class CreditsDetailDO extends UuidIdentityEntityWithOperator implements S
    public void setExchangeGoodsDO(ExchangeGoodsDO exchangeGoodsDO) {
        this.exchangeGoodsDO = exchangeGoodsDO;
    }
    public String getUploadTime() {
        return uploadTime;
    }
    public void setUploadTime(String uploadTime) {
        this.uploadTime = uploadTime;
    }
}

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/CreditsDetailService.java

@@ -304,7 +304,11 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                        taskPatientDetailDao.save(taskPatientDetailDO);
                    }
                }
                creditsDetailDO.setCreateTime(new Date());
                if (creditsDetailDO.getUploadTime()!=null&&creditsDetailDO.getUploadTime()!=""){
                    creditsDetailDO.setCreateTime(DateUtil.strToDateLong(creditsDetailDO.getUploadTime()));
                }else {
                    creditsDetailDO.setCreateTime(new Date());
                }
                creditsDetailDO.setUpdateTime(new Date());
                CreditsDetailDO creditsDetailDO1 =credittsLogDetailDao.save(creditsDetailDO);
                creditsDetailDO1.setFlag(creditsDetailDO.getFlag());