Merge remote-tracking branch 'origin/master'

lyh

2 天以前 bc8cd378fd72f43e66120c540f57f630580aa093

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/BaseToolsServiceImpl.java

@@ -139,4 +139,9 @@
    public IPage<StocktakingPoundVo> pageWithLedgerAndConfig(Page<StocktakingPoundVo> page, QueryWrapper<StocktakingPoundVo> queryWrapper) {
        return baseMapper.pageWithLedgerAndConfig(page, queryWrapper);
    }

    @Override
    public IPage<SharpeeningVo> pageWithSharpedAndConfig(Page<SharpeeningVo> page, QueryWrapper<SharpeeningVo> queryWrapper) {
        return baseMapper.pageWithSharpedAndConfig(page, queryWrapper);
    }
}