Merge remote-tracking branch 'origin/score_shop' into score_shop

xiaoyong931011

2021-03-11 7387cb3e2f9e8b588c7be30b129faeee4050034d

 zq-erp/src/test/java/com/matrix/SourceFlowTests.java

@@ -2,13 +2,11 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysOrderService;
import com.matrix.system.shopXcx.vo.SalesmanVo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -179,7 +177,7 @@

   @Test
   public void inPageTest() {
      Page<ShopSalesmanApply> page = new Page<>(1, 10);
      Page<SalesmanVo> page = new Page<>(1, 10);
      salesmanApplyDao.selectInvitationuserInPage(page, "oLdgp47g7SXJnmti1iDzQaJpXNz4");
   }