beauty-erp.git - Gitblit

summary
reflog
commits
tree
docs
forks
compare

Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-08 d6e902a48df4264d6dbf6ff0c9799c3c30c9d9ff

 zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanOrderDao.java

@@ -26,7 +26,7 @@
     * @param saleOrderDto
     * @return
     */
    IPage<SalesOrderVo> selectSalesManOrder(Page<SalesOrderVo> page,  @Param("record")SaleOrderDto saleOrderDto);
    IPage<SalesOrderVo> selectSalesManOrder(Page<SalesOrderVo> page, @Param("record") SaleOrderDto saleOrderDto);

   LoadFenxiaoOrderBasicVo selectFenxiaoOrderBasicByCompanyId(@Param("companyId")Long companyId);

			@@ -26,7 +26,7 @@
			* @param saleOrderDto
			* @return
			*/
			IPage<SalesOrderVo> selectSalesManOrder(Page<SalesOrderVo> page, @Param("record")SaleOrderDto saleOrderDto);
			IPage<SalesOrderVo> selectSalesManOrder(Page<SalesOrderVo> page, @Param("record") SaleOrderDto saleOrderDto);

			LoadFenxiaoOrderBasicVo selectFenxiaoOrderBasicByCompanyId(@Param("companyId")Long companyId);