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

zss

3 天以前 1942fb9f1a4dd6a90daca24e3a093c138e0e48c3

 src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java

@@ -69,4 +69,6 @@
    int deleteCustomerByIds(Long[] ids);

    IPage<CustomerVo> listPage(Page<CustomerDto> page, @Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId);

    List<CustomerVo> list(@Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId);
}