Merge branch 'master' into ysx-银行账号优化-20240617

# Conflicts:
#	app/Http/Services/DataService.php

app/Http/Services/SupplierReceiptService.php

@@ -20,4 +20,8 @@ class SupplierReceiptService
     public static function transferAccountNo($str) {
     public static function transferAccountNo($str) {
         return preg_replace("/[^0-9a-zA-Z\-\(\)]/", "", $str);
         return preg_replace("/[^0-9a-zA-Z\-\(\)]/", "", $str);
     }
     }
+
+    public static function keepOnlyDigitsAndHyphen($str) {
+        return preg_replace("/[^0-9\-]/", "", $str);
+    }
 }
 }