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

Conflicts:
	svr/svr-iot/src/main/resources/application.yml

svr/svr-iot/src/main/java/com/yihu/iot/controller/product/IotProductController.java

@@ -55,7 +55,7 @@ public class IotProductController extends EnvelopRestController {
                size = 10;
            }
            String filters = "";
            String semicolon = "";
            String semicolon = "del=1;";
            if(StringUtils.isNotBlank(name)){
                filters = "name?"+name+" g1;registerCertificate?"+name+" g1";
                semicolon = ";";
@@ -68,9 +68,6 @@ public class IotProductController extends EnvelopRestController {
                filters += semicolon +"productClassify="+classify;
                semicolon = ";";
            }
            if(StringUtils.isBlank(filters)){
                filters+= semicolon + "del=1";
            }
            String sorts = "-updateTime";
            //得到list数据
            List<IotProductBaseInfoDO> list = iotProductBaseInfoService.search(null, filters, sorts, page, size);

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyCertificateService.java

@@ -92,7 +92,7 @@ public class IotCompanyCertificateService extends BaseJpaService<IotCompanyCerti
            old.setManufacturerId(iotCompanyCertificateDO.getManufacturerId());
            old.setCompanyName(iotCompanyCertificateDO.getCompanyName());
            old.setCompanyId(iotCompanyCertificateDO.getCompanyId());
            old.setLaunchCcompanyBusinessLicense(iotCompanyCertificateDO.getLaunchCcompanyBusinessLicense());
            old.setLaunchCompanyBusinessLicense(iotCompanyCertificateDO.getLaunchCompanyBusinessLicense());
            old.setLaunchCompanyId(iotCompanyCertificateDO.getLaunchCompanyId());
            old.setLaunchCompanyName(iotCompanyCertificateDO.getLaunchCompanyName());
            old.setStartTime(iotCompanyCertificateDO.getStartTime());