Merge branch 'master' of http://139.186.142.91:10010/r/productDev/intellige...

MrShi

7 天以前 ff7f47b70d93eace91e7ceda07d590cf26234628

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/intelligent_manufacture_wuhu

 serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java

@@ -1294,6 +1294,7 @@
        queryWrapper.selectAll(Declares.class);
        queryWrapper.leftJoin(Company.class, Company::getId, Declares::getCompanyId);
        queryWrapper.eq(Declares::getIsdeleted, Constants.ZERO);
        queryWrapper.ne(Declares::getStatus, Constants.ZERO);
        queryWrapper.eq(Declares::getProjectId, param.getProjectId());
        queryWrapper.eq(param.getSoId()!=null,Declares::getSoId, param.getSoId());


 serverWuhu/src/main/resources/application.yml

@@ -10,7 +10,7 @@
#  application:
#    name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson: