Merge remote-tracking branch 'origin/1.11rg' into 1.11rg

zyy

2026-01-19 b864ea85f84cee2df8616f4eb5757f5f3f1a5c43

 src/main/java/com/nq/service/impl/AgentAgencyFeeServiceImpl.java

@@ -127,7 +127,7 @@
            return -1;
        }
        //模拟用户下单不计算分红
        User user = userMapper.selectByPrimaryKey(userPosition.getUserId());
        User user = userMapper.selectById(userPosition.getUserId());
        if(user.getAccountType() != 0 || user.getIsLock() != 0 || user.getIsActive() != 2){
            return -2;
        }