重置修改项

.gitignore

@@ -59,3 +59,4 @@ Thumbs.db
 /jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
 /jyzb-boot/src/main/resources/application.yml
 /jyzb-boot/pom.xml
+/.idea/encodings.xml

.gitignore.orig

-<<<<<<< HEAD
-/jyzb-process/target
-/jyzb-api/target/
-/jyzb-biz/target/
-##ignore this file##
-/target/
-
-.classpath
-.project
-/.settings/
- ##filter databfile、sln file##
-*.mdb
-*.ldb
-*.sln
-##class file##
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-# compression file
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.via
-*.tmp
-*.err
-# OS generated files #
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db
-/*/target/*
-=======
-/jyzb-boot/target
->>>>>>> develop

.idea/encodings.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/java" charset="UTF-8" />
-    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-api/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-api/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-biz/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-biz/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-boot/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-boot/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-common/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-consumer/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-consumer/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-producer/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-producer/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-mq/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-mq/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-process/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jyzb-process/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file