fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 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 {