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

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -3,10 +3,7 @@ package com.yihu.jw.order;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPObject;
import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.im.ConsultDo;
import com.yihu.jw.entity.base.patient.BasePatientDO;
@@ -36,8 +33,6 @@ import com.yihu.jw.order.dao.ConsultOrderDao;
import com.yihu.jw.order.pay.wx.WeChatConfig;
import com.yihu.jw.order.pay.ylz.YlzPayService;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.util.common.BeanUtils;
import com.yihu.jw.util.common.QrcodeUtil;
import com.yihu.jw.util.common.XMLUtil;
import com.yihu.jw.util.date.DateUtil;
@@ -48,13 +43,11 @@ import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.jw.wechat.dao.WechatDao;
import com.yihu.jw.wechat.dao.WxPayLogDao;
import com.yihu.mysql.query.BaseJpaService;
import com.ylzinfo.ehc.common.utils.DateUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -983,7 +976,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
           ConsultDo consultDo = consultOrderDao.findOne(businessOrderDO.getRelationCode());
           consultDo.setPayStatus(1);
           consultOrderDao.save(consultDo);
        }else if (businessOrderDO.getOrderCategory().equalsIgnoreCase("2")){
        }else if (businessOrderDO.getOrderCategory().equalsIgnoreCase("2")||businessOrderDO.getOrderCategory().equalsIgnoreCase("3")){
           WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(businessOrderDO.getRelationCode());
           wlyyOutpatientDO.setPayStatus(1);
           outpatientDao.save(wlyyOutpatientDO);

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/message/BaseBannerDO.java

@@ -41,7 +41,7 @@ public class BaseBannerDO extends UuidIdentityEntityWithOperator {
    /**
     * 排序
     */
    @Column(name = "sort")
    @Column(name = "is_sort")
    private Integer sort;
    /*
    *状态
@@ -94,7 +94,7 @@ public class BaseBannerDO extends UuidIdentityEntityWithOperator {
        this.img = img;
    }
    @Column(name = "sort")
    @Column(name = "is_sort")
    public Integer getSort() {
        return sort;
    }