Merge branch 'refs/heads/master' into xin

xin

2025-09-17 6d31d535d737ed26c4d9d61cd4e0b5483cb9b0ba

 oying-system/src/main/java/com/oying/modules/system/service/MerchantService.java

@@ -56,4 +56,6 @@
    * @throws IOException /
    */
    void download(List<Merchant> all, HttpServletResponse response) throws IOException;

    List<Merchant> findByUserId(Long userId);
}