From 11b43ff91c926fbbd94f9f850ced6eea3a4f4e71 Mon Sep 17 00:00:00 2001 From: pengcheng <1432755665@qq.com> Date: Mon, 12 Aug 2019 11:13:58 +0800 Subject: [PATCH] Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop --- .idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml | 13 ------------- .idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml | 13 ------------- .idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml | 13 ------------- .idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml | 13 ------------- .idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml | 13 ------------- .idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml | 13 ------------- .idea/libraries/Maven__commons_io_commons_io_2_2.xml | 13 ------------- .idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml | 13 ------------- .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml | 13 ------------- .idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml | 13 ------------- 10 files changed, 0 insertions(+), 130 deletions(-) delete mode 100644 .idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml delete mode 100644 .idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml delete mode 100644 .idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml delete mode 100644 .idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml delete mode 100644 .idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml delete mode 100644 .idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml delete mode 100644 .idea/libraries/Maven__commons_io_commons_io_2_2.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml delete mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml deleted file mode 100644 index d41bbbc..0000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.baomidou:mybatis-plus:3.1.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml deleted file mode 100644 index 4a46b21..0000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml deleted file mode 100644 index a495bd8..0000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml deleted file mode 100644 index 7a6a0bf..0000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.baomidou:mybatis-plus-core:3.1.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml deleted file mode 100644 index 4dec47a..0000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.baomidou:mybatis-plus-extension:3.1.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml deleted file mode 100644 index 3b9dcc0..0000000 --- a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: commons-fileupload:commons-fileupload:1.4"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_2.xml b/.idea/libraries/Maven__commons_io_commons_io_2_2.xml deleted file mode 100644 index f8084ec..0000000 --- a/.idea/libraries/Maven__commons_io_commons_io_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: commons-io:commons-io:2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml deleted file mode 100644 index e633f81..0000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.mybatis:mybatis:3.5.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml deleted file mode 100644 index f49fd3a..0000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.mybatis:mybatis-spring:2.0.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml deleted file mode 100644 index 9843fa4..0000000 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.projectlombok:lombok:1.18.8"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file -- libgit2 0.22.2