Merge branch 'security_20240424'

zhoushihao

2024-04-28 48be263891d34bfac0417c1e8d047fef673f0900

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java

@@ -32,7 +32,7 @@
    @Override
    public int getGlassInfoCountByFlowCardId(String flowCardId) {
        QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("flowcard_id", flowCardId);
        queryWrapper.eq("flow_card_id", flowCardId);

        return baseMapper.selectCount(queryWrapper);
    }
@@ -47,7 +47,7 @@
    @Override
    public GlassInfo selectGlassId(String id) {
        QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id", id);
        queryWrapper.eq("glass_id", id);

        return baseMapper.selectOne(queryWrapper);
    }