Merge remote-tracking branch 'origin/master'

lyh

2 天以前 bc8cd378fd72f43e66120c540f57f630580aa093

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/BaseToolsMapper.java

@@ -35,4 +35,7 @@
    IPage<ParaBladeVo> paraBladeList(Page<ParaBladeVo> page,
                                               @Param(Constants.WRAPPER) Wrapper<ParaBladeVo> queryWrapper);

    IPage<StocktakingPoundVo> pageWithLedgerAndConfig(Page<StocktakingPoundVo> page, @Param(Constants.WRAPPER) Wrapper<StocktakingPoundVo> wrapper);

    IPage<SharpeeningVo> pageWithSharpedAndConfig(Page<SharpeeningVo> page, @Param(Constants.WRAPPER) Wrapper<SharpeeningVo> wrapper);
}