Merge remote-tracking branch 'origin/master'

fei.wang

2024-05-13 68bd753f1b77f39c1dd5609620ce29f9b8b412b5

 src/main/java/com/flow/service/impl/LoginJiLuServiceImpl.java

@@ -35,9 +35,10 @@
        return info;
    }

    public PageInfo<Loginjilu> FindLoginJiLuZi(String Zong, Integer page, Integer limit) {
    public PageInfo<Loginjilu> FindLoginJiLuZi(Loginjilu loginjilu, Integer page, Integer limit) {

        PageHelper.startPage(page, limit);
        List<Loginjilu> cardList = this.loginJiLuMapper.findAllLoginJiLuZi(Zong);
        List<Loginjilu> cardList = this.loginJiLuMapper.findAllLoginJiLuZi(loginjilu.getLogincompany());
        PageInfo<Loginjilu> info = new PageInfo(cardList);
        return info;
    }