Merge remote-tracking branch 'origin/master'

ZengTao

6 天以前 994b07344c976abcb33ff5eaecd685f6461be5ea

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeHeatLayoutServiceImpl.java

@@ -32,7 +32,7 @@
    public OptimizeHeatLayout selectHeatLayoutInfo(String engineerId, Integer temperingid) {

        QueryWrapper<OptimizeHeatLayout> wrapper = new QueryWrapper<>();
        wrapper.select("Top 1 *").eq("project_no", engineerId)
        wrapper.eq("project_no", engineerId)
                .eq("layout_id", temperingid);
        return baseMapper.selectOne(wrapper);
    }