diff --git a/.idea/1807c_git.iml b/.idea/1807c_git.iml
index 1e5709f8012a49d6d23e0ba71240aff8879d94bb..f55066ad858740c4030814ae18c05e041a756754 100644
--- a/.idea/1807c_git.iml
+++ b/.idea/1807c_git.iml
@@ -14,7 +14,7 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.6 (demo) (1)" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">
@@ -26,7 +26,6 @@
     </option>
   </component>
   <component name="TestRunnerService">
-    <option name="projectConfiguration" value="pytest" />
-    <option name="PROJECT_TEST_RUNNER" value="pytest" />
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 15a15b218a29e09c9190992732698d646e4d659a..0000000000000000000000000000000000000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d15120efe9b91328913e797f8d500fe04cdfe0cc..01db21d20ec35e0fa8593acf8edba46cbfedf43d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,13 +3,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-<<<<<<< HEAD
-<<<<<<< HEAD
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (demo) (1)" project-jdk-type="Python SDK" />
-=======
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 " project-jdk-type="Python SDK" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-=======
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (day01)" project-jdk-type="Python SDK" />
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5 (zhuce_denglu)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dea7c3c338edd52f9eb9e318c6d607a9bc703b5d..29388a1fb460cd1511b295dbcc48331f191294db 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,284 +1,130 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-<<<<<<< HEAD
-    <list default="true" id="15ff3e69-5231-4cf7-a2b8-dc96f22eee4d" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/klq/urls.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/templates/klq.html" afterDir="false" />
-=======
-    <list default="true" id="bd9edc7b-5132-493d-bcfb-bfd4d59cbd29" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/templates/wsw.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wsw/urls.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/1807c_git.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/1807c_git.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-      <change beforePath="$PROJECT_DIR$/git_cs/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/git_cs/settings.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/git_cs/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/git_cs/urls.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/index.html" afterDir="false" />
-    </list>
+    <list default="true" id="5111f1fb-b43e-45aa-9c81-44d80a09a050" name="Default Changelist" comment="" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    <option name="TRACKING_ENABLED" value="true" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-=======
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-<<<<<<< HEAD
-  <component name="DjangoConsoleOptions" custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)">
-    <option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1622040902">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.open.time.1" value="1" />
-          <entry key="project.opened" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="html" value="49" />
-          <entry key="py" value="93" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="HTML" value="49" />
-          <entry key="Python" value="93" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="html" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="HTML" value="1" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/klq/urls.py">
+        <entry file="file://$PROJECT_DIR$/zhangruiqiang/urls.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="231">
-              <caret line="7" column="1" lean-forward="true" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
+            <state relative-caret-position="16">
+              <caret line="3" column="26" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
               <folding>
-                <element signature="e#0#21#0" expanded="true" />
+                <element signature="e#0#28#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/git_cs/settings.py">
+        <entry file="file://$PROJECT_DIR$/zhangruiqiang/apps.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="429">
-              <caret line="40" column="1" selection-start-line="40" selection-start-column="1" selection-end-line="40" selection-end-column="1" />
-=======
-  <component name="FileEditorManager">
-    <leaf>
+            <state relative-caret-position="64">
+              <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/wsw/urls.py">
+        <entry file="file://$PROJECT_DIR$/templates/index.html">
           <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-            <state relative-caret-position="310">
-              <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
+            <state relative-caret-position="544">
+              <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
-<<<<<<< HEAD
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/git_cs/urls.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="469">
-              <caret line="17" column="15" lean-forward="true" selection-start-line="17" selection-start-column="15" selection-end-line="17" selection-end-column="15" />
-              <folding>
-                <element signature="e#630#667#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="306">
+              <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/index.html">
+        <entry file="file://$PROJECT_DIR$/git_cs/settings.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="363">
-              <caret line="11" column="13" lean-forward="true" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-=======
-            <state relative-caret-position="250">
-              <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-              <folding>
-                <element signature="e#0#37#0" expanded="true" />
-              </folding>
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
+            <state relative-caret-position="752">
+              <caret line="47" column="20" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-<<<<<<< HEAD
-        <entry file="file://$PROJECT_DIR$/klq/views.py">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/zhangruiqiang/tests.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="4" column="36" lean-forward="true" selection-start-line="4" selection-start-column="36" selection-end-line="4" selection-end-column="36" />
-=======
-      <file leaf-file-name="fxy.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/fxy.html">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file leaf-file-name="hbj.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/hbj.html">
-          <provider selected="true" editor-type-id="text-editor" />
+            <state relative-caret-position="48">
+              <caret line="3" selection-start-line="3" selection-end-line="3" />
+            </state>
+          </provider>
         </entry>
       </file>
-      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/git_cs/urls.py">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/zhanghao/urls.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1032">
-              <caret line="37" selection-start-line="37" selection-end-line="37" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
+            <state>
+              <caret selection-end-line="7" selection-end-column="1" />
+              <folding>
+                <element signature="e#0#28#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/klq.html">
+        <entry file="file://$PROJECT_DIR$/zhangruiqiang/views.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="297">
-              <caret line="9" column="7" lean-forward="true" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
-=======
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-=======
-        <entry file="file://$PROJECT_DIR$/templates/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="30" column="13" lean-forward="true" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
+            <state relative-caret-position="80">
+              <caret line="5" column="33" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Python Script" />
-<<<<<<< HEAD
         <option value="HTML File" />
       </list>
     </option>
   </component>
-=======
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-=======
-      </list>
-    </option>
-  </component>
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-<<<<<<< HEAD
-<<<<<<< HEAD
+        <option value="$PROJECT_DIR$/templates/zhangrq.html" />
         <option value="$PROJECT_DIR$/git_cs/settings.py" />
-        <option value="$PROJECT_DIR$/git_cs/urls.py" />
+        <option value="$PROJECT_DIR$/zhangruiqiang/views.py" />
+        <option value="$PROJECT_DIR$/zhangruiqiang/urls.py" />
         <option value="$PROJECT_DIR$/templates/index.html" />
-        <option value="$PROJECT_DIR$/klq/urls.py" />
-        <option value="$PROJECT_DIR$/klq/views.py" />
-        <option value="$PROJECT_DIR$/templates/klq.html" />
-=======
-        <option value="$PROJECT_DIR$/templates/index.html" />
-        <option value="$PROJECT_DIR$/git_cs/settings.py" />
         <option value="$PROJECT_DIR$/git_cs/urls.py" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
       </list>
     </option>
   </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-<<<<<<< HEAD
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="326" />
-    <option name="y" value="9" />
-    <option name="width" value="1067" />
-    <option name="height" value="1040" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="420" />
+    <option name="y" value="70" />
+    <option name="width" value="1350" />
+    <option name="height" value="930" />
   </component>
-=======
-  <component name="NodePackageJsonFileManager">
-    <packageJsonPaths />
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-=======
-        <option value="$PROJECT_DIR$/templates/wsw.html" />
-        <option value="$PROJECT_DIR$/git_cs/settings.py" />
-        <option value="$PROJECT_DIR$/git_cs/urls.py" />
-        <option value="$PROJECT_DIR$/wsw/views.py" />
-        <option value="$PROJECT_DIR$/wsw/urls.py" />
-        <option value="$PROJECT_DIR$/templates/index.html" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="7">
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
-    <option name="x" value="-10" />
-    <option name="y" value="-10" />
-    <option name="width" value="1940" />
-    <option name="height" value="1050" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
-    <ConfirmationsSetting value="2" id="Add" />
-  </component>
-<<<<<<< HEAD
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-=======
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <pane id="Scope" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-=======
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -294,33 +140,17 @@
             <path>
               <item name="1807c_git" type="b2602c69:ProjectViewProjectNode" />
               <item name="1807c_git" type="462c0819:PsiDirectoryNode" />
-<<<<<<< HEAD
-              <item name="klq" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="1807c_git" type="b2602c69:ProjectViewProjectNode" />
               <item name="1807c_git" type="462c0819:PsiDirectoryNode" />
-=======
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="zhanghao" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="1807c_git" type="b2602c69:ProjectViewProjectNode" />
               <item name="1807c_git" type="462c0819:PsiDirectoryNode" />
-              <item name="wsw" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-<<<<<<< HEAD
-<<<<<<< HEAD
-      <pane id="Scope">
-        <subPane subId="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope">
-          <expand>
-            <path>
-              <item name="1807c_git" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
-              <item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
+              <item name="zhangruiqiang" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -330,29 +160,10 @@
   </component>
   <component name="PropertiesComponent">
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="E:/python学习/demo" />
-=======
-=======
-      <pane id="Scope" />
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-<<<<<<< HEAD
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-=======
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="F:\桌面\test2\1807c_git\templates" />
-    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -389,286 +200,123 @@
       <option name="runNoReload" value="false" />
       <option name="useCustomRunCommand" value="false" />
       <option name="customRunCommand" value="" />
-<<<<<<< HEAD
-<<<<<<< HEAD
-      <method v="2" />
-=======
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-=======
       <method v="2" />
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
     </configuration>
   </component>
   <component name="SvnConfiguration">
-    <configuration>C:\Users\lenovo\AppData\Roaming\Subversion</configuration>
-    <supportedVersion>125</supportedVersion>
+    <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-<<<<<<< HEAD
-      <changelist id="15ff3e69-5231-4cf7-a2b8-dc96f22eee4d" name="Default Changelist" comment="" />
-      <created>1565869016023</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1565869016023</updated>
-=======
-      <changelist id="bd9edc7b-5132-493d-bcfb-bfd4d59cbd29" name="Default" comment="" />
-      <created>1565868713906</created>
+      <changelist id="5111f1fb-b43e-45aa-9c81-44d80a09a050" name="Default Changelist" comment="" />
+      <created>1565873546147</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1565868713906</updated>
-<<<<<<< HEAD
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-=======
-      <workItem from="1565871044418" duration="25000" />
-      <workItem from="1565871098075" duration="30000" />
-      <workItem from="1565871173819" duration="262000" />
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
+      <updated>1565873546147</updated>
+      <workItem from="1565873550490" duration="508000" />
+      <workItem from="1565874549650" duration="41000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="317000" />
+    <option name="totallyTimeSpent" value="549000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+    <frame x="336" y="56" width="1080" height="744" extended-state="0" />
     <layout>
-<<<<<<< HEAD
-<<<<<<< HEAD
-      <window_info id="Favorites" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Python Console" />
-      <window_info anchor="bottom" id="Terminal" visible="true" weight="0.37201735" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="SciView" />
-      <window_info anchor="right" id="Database" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-=======
-=======
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12206573" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25440314" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.48088235" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.4379085" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" />
-      <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.3617647" />
-      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Terminal" order="11" />
       <window_info anchor="bottom" id="Python Console" order="12" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="SciView" order="4" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12072434" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.41442716" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" />
-      <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.12941177" />
-      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
-      <window_info anchor="bottom" id="Python Console" order="12" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-<<<<<<< HEAD
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
+      <window_info anchor="right" id="SciView" order="3" />
+      <window_info anchor="right" id="Database" order="4" />
     </layout>
-=======
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="SciView" order="4" />
-    </layout-to-restore>
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-<<<<<<< HEAD
-    <entry file="file://$PROJECT_DIR$/git_cs/settings.py">
-      <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-        <state relative-caret-position="429">
-          <caret line="40" column="1" selection-start-line="40" selection-start-column="1" selection-end-line="40" selection-end-column="1" />
-=======
-        <state relative-caret-position="1200">
-          <caret line="40" selection-start-line="40" selection-end-line="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/git_cs/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="540">
-          <caret line="19" column="1" selection-start-line="19" selection-start-column="1" selection-end-line="19" selection-end-column="1" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/index.html">
+    <entry file="file://$PROJECT_DIR$/templates/zhangrq.html">
       <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-        <state relative-caret-position="363">
-          <caret line="11" column="13" lean-forward="true" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-=======
-        <state relative-caret-position="300">
-          <caret line="10" column="13" lean-forward="true" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/git_cs/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-        <state relative-caret-position="469">
-          <caret line="17" column="15" lean-forward="true" selection-start-line="17" selection-start-column="15" selection-end-line="17" selection-end-column="15" />
-          <folding>
-            <element signature="e#630#667#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="128">
+          <caret line="8" column="9" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/klq/urls.py">
+    <entry file="file://$PROJECT_DIR$/zhangruiqiang/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="7" column="1" lean-forward="true" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
+        <state relative-caret-position="16">
+          <caret line="3" column="26" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
           <folding>
-            <element signature="e#0#21#0" expanded="true" />
+            <element signature="e#0#28#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/klq.html">
+    <entry file="file://$PROJECT_DIR$/zhangruiqiang/apps.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="9" column="7" lean-forward="true" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/klq/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="4" column="36" lean-forward="true" selection-start-line="4" selection-start-column="36" selection-end-line="4" selection-end-column="36" />
-=======
-        <state relative-caret-position="600">
-          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
+        <state relative-caret-position="64">
+          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="26" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/git_cs/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1200">
-          <caret line="40" selection-start-line="40" selection-end-line="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
+        <state relative-caret-position="752">
+          <caret line="47" column="20" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-=======
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
-    <entry file="file://$PROJECT_DIR$/manage.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/zhanghao.html" />
-    <entry file="file://$PROJECT_DIR$/templates/lishan.html" />
-    <entry file="file://$PROJECT_DIR$/hbj/urls.py" />
-    <entry file="file://$PROJECT_DIR$/lishan/urls.py" />
-    <entry file="file://$PROJECT_DIR$/lishan/views.py" />
-    <entry file="file://$PROJECT_DIR$/templates/dusen.html" />
-    <entry file="file://$PROJECT_DIR$/dusen/urls.py" />
-    <entry file="file://$PROJECT_DIR$/dusen/views.py" />
-    <entry file="file://$PROJECT_DIR$/templates/fxy.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/hbj.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/wsw.html">
+    <entry file="file://$PROJECT_DIR$/zhangruiqiang/tests.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="6" column="6" lean-forward="true" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
+        <state relative-caret-position="48">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/git_cs/settings.py">
+    <entry file="file://$PROJECT_DIR$/zhanghao/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="513">
-          <caret line="48" column="10" selection-start-line="48" selection-start-column="10" selection-end-line="48" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/git_cs/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="39" />
+        <state>
+          <caret selection-end-line="7" selection-end-column="1" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wsw/views.py">
+    <entry file="file://$PROJECT_DIR$/zhangruiqiang/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
+        <state relative-caret-position="80">
+          <caret line="5" column="33" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wsw/urls.py">
+    <entry file="file://$PROJECT_DIR$/templates/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="250">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-          <folding>
-            <element signature="e#0#37#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="544">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/index.html">
+    <entry file="file://$PROJECT_DIR$/git_cs/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-        <state relative-caret-position="150">
-          <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
->>>>>>> 27aab865e29cc677e95f81b43e029fa791f98253
-=======
-        <state relative-caret-position="225">
-          <caret line="30" column="13" lean-forward="true" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
->>>>>>> 037fc43b1cb47fa87ec7bb48714c0eea556068e6
+        <state relative-caret-position="306">
+          <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
         </state>
       </provider>
     </entry>
diff --git a/dusen/__pycache__/__init__.cpython-35.pyc b/dusen/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8e0bf47ea4ecf5d6d42993eadf3477acd5ce833a
Binary files /dev/null and b/dusen/__pycache__/__init__.cpython-35.pyc differ
diff --git a/dusen/__pycache__/admin.cpython-35.pyc b/dusen/__pycache__/admin.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..92096315a41736b92ab13f627d0bd9ec0d00beb0
Binary files /dev/null and b/dusen/__pycache__/admin.cpython-35.pyc differ
diff --git a/dusen/__pycache__/models.cpython-35.pyc b/dusen/__pycache__/models.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a07e0f39b90ed4237fd133cb48af4bdbf3320838
Binary files /dev/null and b/dusen/__pycache__/models.cpython-35.pyc differ
diff --git a/dusen/__pycache__/urls.cpython-35.pyc b/dusen/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..844f1a900946019233efb410f5bdf732317edfce
Binary files /dev/null and b/dusen/__pycache__/urls.cpython-35.pyc differ
diff --git a/dusen/__pycache__/views.cpython-35.pyc b/dusen/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a0cff7e61e82ad3d4a193b0c9f2cc93ea7776b16
Binary files /dev/null and b/dusen/__pycache__/views.cpython-35.pyc differ
diff --git a/dusen/migrations/__pycache__/__init__.cpython-35.pyc b/dusen/migrations/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..93162c1686bf5c0cc79288c1976368c9d9806752
Binary files /dev/null and b/dusen/migrations/__pycache__/__init__.cpython-35.pyc differ
diff --git a/fxy/__pycache__/__init__.cpython-35.pyc b/fxy/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..118665b2122664420e82aaef996ac4b6e6032cde
Binary files /dev/null and b/fxy/__pycache__/__init__.cpython-35.pyc differ
diff --git a/fxy/__pycache__/admin.cpython-35.pyc b/fxy/__pycache__/admin.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1ecd1129b98ddecd01dc69bb36d2c5715a621ce0
Binary files /dev/null and b/fxy/__pycache__/admin.cpython-35.pyc differ
diff --git a/fxy/__pycache__/models.cpython-35.pyc b/fxy/__pycache__/models.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..585020a67ca16e25febcbbee2767f5638d115d8a
Binary files /dev/null and b/fxy/__pycache__/models.cpython-35.pyc differ
diff --git a/fxy/__pycache__/urls.cpython-35.pyc b/fxy/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f570590df87e494731977fe2b9a1d4ea8c01d99b
Binary files /dev/null and b/fxy/__pycache__/urls.cpython-35.pyc differ
diff --git a/fxy/__pycache__/views.cpython-35.pyc b/fxy/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d677a5956a751c821e55316da8cec39a96139890
Binary files /dev/null and b/fxy/__pycache__/views.cpython-35.pyc differ
diff --git a/fxy/migrations/__pycache__/__init__.cpython-35.pyc b/fxy/migrations/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..aa4e555a85ffdc54a7b8c46e6195834e5564768f
Binary files /dev/null and b/fxy/migrations/__pycache__/__init__.cpython-35.pyc differ
diff --git a/git_cs/__pycache__/__init__.cpython-35.pyc b/git_cs/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7d60be9ba424c9a268a865ea09aab34095262d4e
Binary files /dev/null and b/git_cs/__pycache__/__init__.cpython-35.pyc differ
diff --git a/git_cs/__pycache__/settings.cpython-35.pyc b/git_cs/__pycache__/settings.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..82ea35a3fe06e04d9cafa370e2bd7aa2760ff482
Binary files /dev/null and b/git_cs/__pycache__/settings.cpython-35.pyc differ
diff --git a/git_cs/__pycache__/urls.cpython-35.pyc b/git_cs/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..72a50bbb7eea359294acfd12e35523ae0ded4f1e
Binary files /dev/null and b/git_cs/__pycache__/urls.cpython-35.pyc differ
diff --git a/git_cs/__pycache__/wsgi.cpython-35.pyc b/git_cs/__pycache__/wsgi.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d38af9ca204c922b988b523b91110d8f4ffcb4fb
Binary files /dev/null and b/git_cs/__pycache__/wsgi.cpython-35.pyc differ
diff --git a/git_cs/settings.py b/git_cs/settings.py
index bc95f595d9d6c8fb7d5fd82254705403202e77ad..9fefffff3a33f6ff3d403546ce14a88562c9c8ad 100644
--- a/git_cs/settings.py
+++ b/git_cs/settings.py
@@ -45,6 +45,7 @@ INSTALLED_APPS = [
     'fxy',
     'houxiaodong',
     'guanliang',
+    'zhangruiqiang',
 
     'wsw',
 
diff --git a/git_cs/urls.py b/git_cs/urls.py
index 36ce7a3ed54917a2e6b665b067f6032fae097615..019f6dd834b2093e96d213cda7eece489576ac30 100644
--- a/git_cs/urls.py
+++ b/git_cs/urls.py
@@ -24,15 +24,16 @@ urlpatterns = [
     path('hbj/',include('hbj.urls')),
     path('dusen/',include('dusen.urls')),
     path('zhanghao/',include('zhanghao.urls')),
-    path('zhanghao/',include('zhanghao.urls')),
+    # path('zhanghao/',include('zhanghao.urls')),
     path('fxy/',include('fxy.urls')),
 
-    path('hxd/', include('houxiaodong.urls')),
+    # path('hxd/', include('houxiaodong.urls')),
 
 
     path('guanliang/', include('guanliang.urls')),
 
     path('hxd/', include('houxiaodong.urls')),
+    path('zhangruiqiang/',include('zhangruiqiang.urls')),
 
     path('wsw/',include('wsw.urls')),
 
diff --git a/guanliang/__pycache__/__init__.cpython-35.pyc b/guanliang/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..94f8a7f7f287f00a76ccd1b1ec437d227ef42f35
Binary files /dev/null and b/guanliang/__pycache__/__init__.cpython-35.pyc differ
diff --git a/guanliang/__pycache__/admin.cpython-35.pyc b/guanliang/__pycache__/admin.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..03718a336cb6ef4aea574d1317c41b9860a24f76
Binary files /dev/null and b/guanliang/__pycache__/admin.cpython-35.pyc differ
diff --git a/guanliang/__pycache__/models.cpython-35.pyc b/guanliang/__pycache__/models.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..01ce450940e4616a6251a31618eabdc73242b8ca
Binary files /dev/null and b/guanliang/__pycache__/models.cpython-35.pyc differ
diff --git a/guanliang/__pycache__/urls.cpython-35.pyc b/guanliang/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c8f0fb7fb4861aadb3ac8a5b8e7e40f612ab4b75
Binary files /dev/null and b/guanliang/__pycache__/urls.cpython-35.pyc differ
diff --git a/guanliang/__pycache__/views.cpython-35.pyc b/guanliang/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..89605d0ce52f3aa5f4aa31857c47787baacd03ea
Binary files /dev/null and b/guanliang/__pycache__/views.cpython-35.pyc differ
diff --git a/guanliang/migrations/__pycache__/__init__.cpython-35.pyc b/guanliang/migrations/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..39aab2a6a9843287f441af07e62ab3c3f4322e36
Binary files /dev/null and b/guanliang/migrations/__pycache__/__init__.cpython-35.pyc differ
diff --git a/hbj/__pycache__/__init__.cpython-35.pyc b/hbj/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d15513e6841f8438769634f6e4144dcaed2aef9e
Binary files /dev/null and b/hbj/__pycache__/__init__.cpython-35.pyc differ
diff --git a/hbj/__pycache__/admin.cpython-35.pyc b/hbj/__pycache__/admin.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..223824ab1b4ff4f79365f60aa2f2e344d8e922c2
Binary files /dev/null and b/hbj/__pycache__/admin.cpython-35.pyc differ
diff --git a/hbj/__pycache__/models.cpython-35.pyc b/hbj/__pycache__/models.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ae2a1ff385e9cd6a0026f487f654fcc7a58cca39
Binary files /dev/null and b/hbj/__pycache__/models.cpython-35.pyc differ
diff --git a/hbj/__pycache__/urls.cpython-35.pyc b/hbj/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..719a03c03169b26eadd5c47512821b1c1cb8972b
Binary files /dev/null and b/hbj/__pycache__/urls.cpython-35.pyc differ
diff --git a/hbj/__pycache__/views.cpython-35.pyc b/hbj/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d566171e00d7b6b11d290deedf28e817a8178e5f
Binary files /dev/null and b/hbj/__pycache__/views.cpython-35.pyc differ
diff --git a/hbj/migrations/__pycache__/__init__.cpython-35.pyc b/hbj/migrations/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7cea61fa24a4b0b9d1486e239918cebefdcf6977
Binary files /dev/null and b/hbj/migrations/__pycache__/__init__.cpython-35.pyc differ
diff --git a/houxiaodong/__pycache__/__init__.cpython-35.pyc b/houxiaodong/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..92ca63c2c60d75ff5af6b49e71e89575e4f9f057
Binary files /dev/null and b/houxiaodong/__pycache__/__init__.cpython-35.pyc differ
diff --git a/houxiaodong/__pycache__/admin.cpython-35.pyc b/houxiaodong/__pycache__/admin.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ccb5ee2af049c681ee35a21d19e7992f7082cde2
Binary files /dev/null and b/houxiaodong/__pycache__/admin.cpython-35.pyc differ
diff --git a/houxiaodong/__pycache__/models.cpython-35.pyc b/houxiaodong/__pycache__/models.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4f9eaa00feae4bd95d3996ebdd46a6f13b400f3a
Binary files /dev/null and b/houxiaodong/__pycache__/models.cpython-35.pyc differ
diff --git a/houxiaodong/__pycache__/urls.cpython-35.pyc b/houxiaodong/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0fad58f179f43dd4b2f47b38d6af38e0e98053b8
Binary files /dev/null and b/houxiaodong/__pycache__/urls.cpython-35.pyc differ
diff --git a/houxiaodong/__pycache__/views.cpython-35.pyc b/houxiaodong/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..76a42c7f74ab09a23c56f8ebf95c6033dfdb2648
Binary files /dev/null and b/houxiaodong/__pycache__/views.cpython-35.pyc differ
diff --git a/houxiaodong/migrations/__pycache__/__init__.cpython-35.pyc b/houxiaodong/migrations/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c8832bfe2589601a97b75023c4ddfebe123246f2
Binary files /dev/null and b/houxiaodong/migrations/__pycache__/__init__.cpython-35.pyc differ
diff --git a/klq/__pycache__/__init__.cpython-35.pyc b/klq/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..181b6496b1280a038e7b9d9f8a40e8a53bc297b7
Binary files /dev/null and b/klq/__pycache__/__init__.cpython-35.pyc differ
diff --git a/klq/__pycache__/admin.cpython-35.pyc b/klq/__pycache__/admin.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f20e30592b6bc28ea93a1a356200e59f59a4b2a8
Binary files /dev/null and b/klq/__pycache__/admin.cpython-35.pyc differ
diff --git a/klq/__pycache__/models.cpython-35.pyc b/klq/__pycache__/models.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b943ff61ad04c3a40db251566e9d34c0b30d50df
Binary files /dev/null and b/klq/__pycache__/models.cpython-35.pyc differ
diff --git a/klq/__pycache__/urls.cpython-35.pyc b/klq/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9d50b315d290ac42e3fd3834b79cefdb3bc6727e
Binary files /dev/null and b/klq/__pycache__/urls.cpython-35.pyc differ
diff --git a/klq/__pycache__/views.cpython-35.pyc b/klq/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e739a20680f7f34810600233dd53161eb45c8585
Binary files /dev/null and b/klq/__pycache__/views.cpython-35.pyc differ
diff --git a/klq/migrations/__pycache__/__init__.cpython-35.pyc b/klq/migrations/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..600f0d5a1e4f714839cfc3c4b4ee727c6dc3d0d5
Binary files /dev/null and b/klq/migrations/__pycache__/__init__.cpython-35.pyc differ
diff --git a/lishan/__pycache__/__init__.cpython-35.pyc b/lishan/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ffa426aeacc9ec3c45f6b5c49ad0bc54ed455bc8
Binary files /dev/null and b/lishan/__pycache__/__init__.cpython-35.pyc differ
diff --git a/lishan/__pycache__/admin.cpython-35.pyc b/lishan/__pycache__/admin.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1ef2796bd735c665c03295b0314765fc8c691e40
Binary files /dev/null and b/lishan/__pycache__/admin.cpython-35.pyc differ
diff --git a/lishan/__pycache__/models.cpython-35.pyc b/lishan/__pycache__/models.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..239f3373eefc473807fb265395fe903c4799e09c
Binary files /dev/null and b/lishan/__pycache__/models.cpython-35.pyc differ
diff --git a/lishan/__pycache__/urls.cpython-35.pyc b/lishan/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..57b4ee72ae6b6d537419e86b9b9868d3b6664e4e
Binary files /dev/null and b/lishan/__pycache__/urls.cpython-35.pyc differ
diff --git a/lishan/__pycache__/views.cpython-35.pyc b/lishan/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6388ee35146bbb120a86025046a658cf7d257bb9
Binary files /dev/null and b/lishan/__pycache__/views.cpython-35.pyc differ
diff --git a/lishan/migrations/__pycache__/__init__.cpython-35.pyc b/lishan/migrations/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..22ba39c40ca5f50a3c301b9045dde68ac5d24b5e
Binary files /dev/null and b/lishan/migrations/__pycache__/__init__.cpython-35.pyc differ
diff --git a/templates/index.html b/templates/index.html
index 24043c3b2354e69be5c9134f032a1739c2454460..3eaf75f796ca82c09f8d585e0049844f8b91eac1 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,12 +7,8 @@
 <body>
 <h1>1807C    Git     测试项目</h1>
 <ul>
-
     <li><a href="{% url 'klq:klq' %}">孔令琪</a></li>
-
     <li></li>
-
-
     <li><a href="{% url 'hbj:hbj' %}">韩宾杰</a></li>
 
     <li></li>
@@ -27,7 +23,7 @@
 
     <li><a href="{% url 'wsw:wsw' %}">吴双伟</a></li>
     <li><a href="{% url 'hxd:hxd' %}">侯晓栋</a></li>
-    <li></li>
+    <li><a href="{% url 'zhangruiqiang:zhangruiqiang' %}">张瑞强</a></li>
     <li></li>
     <li></li>
     <li></li>
diff --git a/templates/zhangrq.html b/templates/zhangrq.html
new file mode 100644
index 0000000000000000000000000000000000000000..18430babcc25bb882eb90281dc8445d2845d4897
--- /dev/null
+++ b/templates/zhangrq.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<h1>
+    我是张瑞强
+</h1>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/wsw/__pycache__/__init__.cpython-35.pyc b/wsw/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..29dff5bc8a2d57e23e5592c105b17ea8b0abf6ab
Binary files /dev/null and b/wsw/__pycache__/__init__.cpython-35.pyc differ
diff --git a/wsw/__pycache__/admin.cpython-35.pyc b/wsw/__pycache__/admin.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..57615dbc4c33d2b5395c3afcb09ce944a204b4e7
Binary files /dev/null and b/wsw/__pycache__/admin.cpython-35.pyc differ
diff --git a/wsw/__pycache__/models.cpython-35.pyc b/wsw/__pycache__/models.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..74c5b85e702fb7fc1d6ba8507c6c292c2d976dbf
Binary files /dev/null and b/wsw/__pycache__/models.cpython-35.pyc differ
diff --git a/wsw/__pycache__/urls.cpython-35.pyc b/wsw/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3f25242d5086bdbc4310edb28e63eb2b3f16fd44
Binary files /dev/null and b/wsw/__pycache__/urls.cpython-35.pyc differ
diff --git a/wsw/__pycache__/views.cpython-35.pyc b/wsw/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..df01d7a64aefdcffb850057b728b651427642226
Binary files /dev/null and b/wsw/__pycache__/views.cpython-35.pyc differ
diff --git a/wsw/migrations/__pycache__/__init__.cpython-35.pyc b/wsw/migrations/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ad53a5da3ed2bcbf4f0e760f97afa836e608c939
Binary files /dev/null and b/wsw/migrations/__pycache__/__init__.cpython-35.pyc differ
diff --git a/zhanghao/__pycache__/__init__.cpython-35.pyc b/zhanghao/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..747faad38fcb906447ba0ff6b23501dd7bb52818
Binary files /dev/null and b/zhanghao/__pycache__/__init__.cpython-35.pyc differ
diff --git a/zhanghao/__pycache__/admin.cpython-35.pyc b/zhanghao/__pycache__/admin.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..69849beee8603a202891de09f5c0905d19eadb9c
Binary files /dev/null and b/zhanghao/__pycache__/admin.cpython-35.pyc differ
diff --git a/zhanghao/__pycache__/models.cpython-35.pyc b/zhanghao/__pycache__/models.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..45a14cfb8feac727365e85be5cfbb84fb2697139
Binary files /dev/null and b/zhanghao/__pycache__/models.cpython-35.pyc differ
diff --git a/zhanghao/__pycache__/urls.cpython-35.pyc b/zhanghao/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..88300eadabd02b500fb221f187fcda334eab2daf
Binary files /dev/null and b/zhanghao/__pycache__/urls.cpython-35.pyc differ
diff --git a/zhanghao/__pycache__/views.cpython-35.pyc b/zhanghao/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2acd340e190d86261558425e863533742c1becd8
Binary files /dev/null and b/zhanghao/__pycache__/views.cpython-35.pyc differ
diff --git a/zhanghao/migrations/__pycache__/__init__.cpython-35.pyc b/zhanghao/migrations/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..55a307b52efe1933676090a87349625c9969dce4
Binary files /dev/null and b/zhanghao/migrations/__pycache__/__init__.cpython-35.pyc differ
diff --git a/zhangruiqiang/__init__.py b/zhangruiqiang/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/zhangruiqiang/__pycache__/__init__.cpython-35.pyc b/zhangruiqiang/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1e3d4fa104dffb3ef7dac4f7a45ceeed976ab505
Binary files /dev/null and b/zhangruiqiang/__pycache__/__init__.cpython-35.pyc differ
diff --git a/zhangruiqiang/__pycache__/admin.cpython-35.pyc b/zhangruiqiang/__pycache__/admin.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fc3b17f99b285d2db8799b9805e87d81d09da64a
Binary files /dev/null and b/zhangruiqiang/__pycache__/admin.cpython-35.pyc differ
diff --git a/zhangruiqiang/__pycache__/models.cpython-35.pyc b/zhangruiqiang/__pycache__/models.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..85aeb0836986638ceb657be3a6c089fa830f7a69
Binary files /dev/null and b/zhangruiqiang/__pycache__/models.cpython-35.pyc differ
diff --git a/zhangruiqiang/__pycache__/urls.cpython-35.pyc b/zhangruiqiang/__pycache__/urls.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6d2713e16faa4ef05dcb1a7cced098f58c7c4652
Binary files /dev/null and b/zhangruiqiang/__pycache__/urls.cpython-35.pyc differ
diff --git a/zhangruiqiang/__pycache__/views.cpython-35.pyc b/zhangruiqiang/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0e33051ceca135a169c7678721cf618343e1c4e2
Binary files /dev/null and b/zhangruiqiang/__pycache__/views.cpython-35.pyc differ
diff --git a/zhangruiqiang/admin.py b/zhangruiqiang/admin.py
new file mode 100644
index 0000000000000000000000000000000000000000..8c38f3f3dad51e4585f3984282c2a4bec5349c1e
--- /dev/null
+++ b/zhangruiqiang/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/zhangruiqiang/apps.py b/zhangruiqiang/apps.py
new file mode 100644
index 0000000000000000000000000000000000000000..aca2b39217eee5d83f0e184ff1d350edef016ca5
--- /dev/null
+++ b/zhangruiqiang/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ZhangruiqiangConfig(AppConfig):
+    name = 'zhangruiqiang'
diff --git a/zhangruiqiang/migrations/__init__.py b/zhangruiqiang/migrations/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/zhangruiqiang/migrations/__pycache__/__init__.cpython-35.pyc b/zhangruiqiang/migrations/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0e66088b0ae448e8dc08c1a666cc6e091601cf6e
Binary files /dev/null and b/zhangruiqiang/migrations/__pycache__/__init__.cpython-35.pyc differ
diff --git a/zhangruiqiang/models.py b/zhangruiqiang/models.py
new file mode 100644
index 0000000000000000000000000000000000000000..71a836239075aa6e6e4ecb700e9c42c95c022d91
--- /dev/null
+++ b/zhangruiqiang/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/zhangruiqiang/tests.py b/zhangruiqiang/tests.py
new file mode 100644
index 0000000000000000000000000000000000000000..7ce503c2dd97ba78597f6ff6e4393132753573f6
--- /dev/null
+++ b/zhangruiqiang/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/zhangruiqiang/urls.py b/zhangruiqiang/urls.py
new file mode 100644
index 0000000000000000000000000000000000000000..e95bbe393693714f278086a5bdc967735e2980d7
--- /dev/null
+++ b/zhangruiqiang/urls.py
@@ -0,0 +1,8 @@
+from django.urls import path
+
+from zhangruiqiang import views
+app_name = 'zhangruiqiang'
+
+urlpatterns = [
+    path('zhangruiqiang/', views.index, name='zhangruiqiang')
+]
\ No newline at end of file
diff --git a/zhangruiqiang/views.py b/zhangruiqiang/views.py
new file mode 100644
index 0000000000000000000000000000000000000000..257abe610b1208156548bfadadbe3959286c9af1
--- /dev/null
+++ b/zhangruiqiang/views.py
@@ -0,0 +1,6 @@
+from django.shortcuts import render
+
+# Create your views here.
+def index(request):
+
+    return render(request,"zhangrq.html")
\ No newline at end of file