+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..bb85668
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,188 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..e315828
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..5ce82e7
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..93e1452
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/reportgeneration/App/Crud/ReportCrud.py b/s/App/Crud/ReportCrud.py
similarity index 100%
rename from reportgeneration/App/Crud/ReportCrud.py
rename to s/App/Crud/ReportCrud.py
diff --git a/reportgeneration/App/Crud/__init__.py b/s/App/Crud/__init__.py
similarity index 100%
rename from reportgeneration/App/Crud/__init__.py
rename to s/App/Crud/__init__.py
diff --git a/reportgeneration/App/Model/ReportModel.py b/s/App/Model/ReportModel.py
similarity index 100%
rename from reportgeneration/App/Model/ReportModel.py
rename to s/App/Model/ReportModel.py
diff --git a/reportgeneration/App/Model/__init__.py b/s/App/Model/__init__.py
similarity index 100%
rename from reportgeneration/App/Model/__init__.py
rename to s/App/Model/__init__.py
diff --git a/reportgeneration/App/Router/ReportRouter.py b/s/App/Router/ReportRouter.py
similarity index 100%
rename from reportgeneration/App/Router/ReportRouter.py
rename to s/App/Router/ReportRouter.py
diff --git a/reportgeneration/App/Router/__init__.py b/s/App/Router/__init__.py
similarity index 100%
rename from reportgeneration/App/Router/__init__.py
rename to s/App/Router/__init__.py
diff --git a/reportgeneration/App/Schemas/ReportSchemas.py b/s/App/Schemas/ReportSchemas.py
similarity index 100%
rename from reportgeneration/App/Schemas/ReportSchemas.py
rename to s/App/Schemas/ReportSchemas.py
diff --git a/reportgeneration/App/Schemas/__init__.py b/s/App/Schemas/__init__.py
similarity index 100%
rename from reportgeneration/App/Schemas/__init__.py
rename to s/App/Schemas/__init__.py
diff --git a/reportgeneration/App/__init__.py b/s/App/__init__.py
similarity index 100%
rename from reportgeneration/App/__init__.py
rename to s/App/__init__.py
diff --git a/reportgeneration/README.md b/s/README.md
similarity index 100%
rename from reportgeneration/README.md
rename to s/README.md
diff --git a/reportgeneration/Utils/AccessControl/AccessUtil.py b/s/Utils/AccessControl/AccessUtil.py
similarity index 100%
rename from reportgeneration/Utils/AccessControl/AccessUtil.py
rename to s/Utils/AccessControl/AccessUtil.py
diff --git a/reportgeneration/Utils/AccessControl/__init__.py b/s/Utils/AccessControl/__init__.py
similarity index 100%
rename from reportgeneration/Utils/AccessControl/__init__.py
rename to s/Utils/AccessControl/__init__.py
diff --git a/reportgeneration/Utils/Authentication/Config.py b/s/Utils/Authentication/Config.py
similarity index 100%
rename from reportgeneration/Utils/Authentication/Config.py
rename to s/Utils/Authentication/Config.py
diff --git a/reportgeneration/Utils/Authentication/TokenUtil.py b/s/Utils/Authentication/TokenUtil.py
similarity index 100%
rename from reportgeneration/Utils/Authentication/TokenUtil.py
rename to s/Utils/Authentication/TokenUtil.py
diff --git a/reportgeneration/Utils/Authentication/__init__.py b/s/Utils/Authentication/__init__.py
similarity index 100%
rename from reportgeneration/Utils/Authentication/__init__.py
rename to s/Utils/Authentication/__init__.py
diff --git a/reportgeneration/Utils/File/template/主体信用评级报告模板.docx b/s/Utils/File/template/主体信用评级报告模板.docx
similarity index 100%
rename from reportgeneration/Utils/File/template/主体信用评级报告模板.docx
rename to s/Utils/File/template/主体信用评级报告模板.docx
diff --git a/reportgeneration/Utils/File/template/主体信用评级报告模板.json b/s/Utils/File/template/主体信用评级报告模板.json
similarity index 100%
rename from reportgeneration/Utils/File/template/主体信用评级报告模板.json
rename to s/Utils/File/template/主体信用评级报告模板.json
diff --git a/reportgeneration/Utils/File/template/财务指标.json b/s/Utils/File/template/财务指标.json
similarity index 100%
rename from reportgeneration/Utils/File/template/财务指标.json
rename to s/Utils/File/template/财务指标.json
diff --git a/reportgeneration/main.py b/s/main.py
similarity index 100%
rename from reportgeneration/main.py
rename to s/main.py
diff --git a/reportgeneration/requirements.txt b/s/requirements.txt
similarity index 100%
rename from reportgeneration/requirements.txt
rename to s/requirements.txt
diff --git a/合并说明.md b/合并说明.md
new file mode 100644
index 0000000..e4bc26b
--- /dev/null
+++ b/合并说明.md
@@ -0,0 +1,14 @@
+1. 将各项目内部的代码引用加上项目文件夹名前缀 如:IndexCalculation项目
+```python
+# IndexCalculation项目
+
+from 基本信用评级指标 import *
+->
+from IndexCalculation.基本信用评级指标 import *
+```
+
+2.将各项目的DataBase写在公共Utils文件夹里面
+
+```python
+如
+```