From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/filecopy.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/filecopy.java b/zq-erp/src/main/java/filecopy.java
index 544d6cb..47baa32 100644
--- a/zq-erp/src/main/java/filecopy.java
+++ b/zq-erp/src/main/java/filecopy.java
@@ -13,7 +13,7 @@
static String targetFilePath="/mnt/sdc/webresource";
- static String sourceFilePaht="/mnt/sdc/webresourceback";
+ static String sourceFilePaht="C:\\Users\\Administrator\\Desktop\\webresource";
public static void main(String[] args) throws IOException {
--
Gitblit v1.9.1