x

.idea/workspace.xml

@@ -3,6 +3,12 @@
   <component name="ChangeListManager">
     <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/DoctorMapper.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/DoctorMapper.java" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/mapper/DoctorMapper.xml" afterPath="$PROJECT_DIR$/shop/src/main/resource/mapper/DoctorMapper.xml" />
     </list>
     <ignored path="$PROJECT_DIR$/shop/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,100 +35,122 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="main.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
+      <file leaf-file-name="GoodController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="54" column="60" lean-forward="false" selection-start-line="54" selection-start-column="51" selection-end-line="54" selection-end-column="60" />
+            <state relative-caret-position="335">
+              <caret line="44" column="28" lean-forward="false" selection-start-line="44" selection-start-column="28" selection-end-line="44" selection-end-column="28" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/style/common.css">
+      <file leaf-file-name="IndexController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+            <state relative-caret-position="401">
+              <caret line="151" column="58" lean-forward="false" selection-start-line="151" selection-start-column="58" selection-end-line="151" selection-end-column="58" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="user.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/style/user.css">
+      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="7" column="46" lean-forward="false" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="46" />
+            <state relative-caret-position="270">
+              <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="shop.css" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/shop/static/style/shop.css">
+      <file leaf-file-name="application-dev.properties" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application-dev.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="361">
-              <caret line="56" column="19" lean-forward="false" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GoodController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java">
+      <file leaf-file-name="main.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="287">
-              <caret line="38" column="14" lean-forward="true" selection-start-line="38" selection-start-column="14" selection-end-line="38" selection-end-column="14" />
+            <state relative-caret-position="217">
+              <caret line="293" column="16" lean-forward="false" selection-start-line="293" selection-start-column="16" selection-end-line="293" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TJCallbackController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/api/TJCallbackController.java">
+      <file leaf-file-name="DoctorController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/DoctorController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="30" column="14" lean-forward="true" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
+            <state relative-caret-position="-16">
+              <caret line="43" column="46" lean-forward="false" selection-start-line="43" selection-start-column="46" selection-end-line="43" selection-end-column="46" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ApiController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/api/ApiController.java">
+      <file leaf-file-name="DoctorManageController.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="213">
-              <caret line="42" column="14" lean-forward="true" selection-start-line="42" selection-start-column="14" selection-end-line="42" selection-end-column="14" />
+            <state relative-caret-position="92">
+              <caret line="32" column="59" lean-forward="false" selection-start-line="32" selection-start-column="59" selection-end-line="32" selection-end-column="59" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BuyOrderController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/BuyOrderController.java">
+      <file leaf-file-name="DoctorService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="163">
-              <caret line="79" column="30" lean-forward="false" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="30" />
-              <folding />
+            <state relative-caret-position="169">
+              <caret line="69" column="5" lean-forward="false" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
+              <folding>
+                <element signature="e#1331#1332#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="nHeader.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/style/nHeader.css">
+      <file leaf-file-name="GoodService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="14" column="25" lean-forward="true" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
+            <state relative-caret-position="285">
+              <caret line="43" column="13" lean-forward="false" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="erweimafooter.png" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/images/erweimafooter.png">
-          <provider selected="true" editor-type-id="images">
-            <state />
+      <file leaf-file-name="GoodMapper.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/mapper/GoodMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="439">
+              <caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="21" />
+              <folding>
+                <marker date="1575454051197" expanded="true" signature="286:403" ph="select id, g... good_ad" />
+                <marker date="1575454051197" expanded="true" signature="489:613" ph="insert into good_ad... " />
+                <marker date="1575454051197" expanded="true" signature="702:795" ph="update good_ad... " />
+                <marker date="1575454051197" expanded="true" signature="834:868" ph="delete from good_ad... " />
+                <marker date="1575454051197" expanded="true" signature="928:1028" ph="select gid, " />
+                <marker date="1575454051197" expanded="true" signature="2615:2764" ph="insert into good_base... " />
+                <marker date="1575454051197" expanded="true" signature="2857:2979" ph="update good_base... " />
+                <marker date="1575454051197" expanded="true" signature="3020:3066" ph="update good_base... " />
+                <marker date="1575454051197" expanded="true" signature="3156:3246" ph="update good_base... " />
+                <marker date="1575454051197" expanded="true" signature="3308:3357" ph="select id, g... " />
+                <marker date="1575454051197" expanded="true" signature="3636:3767" ph="insert into good_describe... " />
+                <marker date="1575454051197" expanded="true" signature="3868:3969" ph="update good_describe... " />
+                <marker date="1575454051197" expanded="true" signature="4018:4060" ph="delete from good_describe... " />
+                <marker date="1575454051197" expanded="true" signature="4119:4228" ph="select id, g... " />
+                <marker date="1575454051197" expanded="true" signature="4489:4710" ph="INSERT INTO `good_price`... " />
+                <marker date="1575454051197" expanded="true" signature="4806:4967" ph="update good_price... " />
+              </folding>
+            </state>
           </provider>
         </entry>
       </file>
@@ -138,8 +166,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>shop</find>
-      <find>advertising</find>
       <find>queryNextNew</find>
       <find>ALL_KEYS</find>
       <find>bigweixin</find>
@@ -168,6 +194,8 @@
       <find>click</find>
       <find>zskk-weixin</find>
       <find>.add</find>
+      <find>queryAllGoodBases</find>
+      <find>zskk-bg-</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -184,7 +212,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/EquipmentController.java" />
         <option value="$PROJECT_DIR$/shop/src/main/resource/mapper/EquipmentMapper.xml" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/EquipmentMapper.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/EquipmentService.java" />
@@ -205,9 +232,7 @@
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/ShopConfigService.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/h5/H5IndexController.java" />
         <option value="$PROJECT_DIR$/shop/static/style/subscribe.css" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/DoctorMapper.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java" />
         <option value="$PROJECT_DIR$/shop/src/main/resource/mapper/DoctorMapper.xml" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/DoctorController.java" />
         <option value="$PROJECT_DIR$/shop/static/style/specialist.css" />
@@ -220,13 +245,11 @@
         <option value="$PROJECT_DIR$/shop/src/main/resource/mapper/NewMapper.xml" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/AbstractController.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/GoodBean.java" />
         <option value="$PROJECT_DIR$/shop/static/style/setmeal.css" />
         <option value="$PROJECT_DIR$/shop/static/style/doctors.css" />
         <option value="$PROJECT_DIR$/shop/static/manager/src/components/page/NewsManager.vue" />
         <option value="$PROJECT_DIR$/shop/static/manager/src/components/Sidebar.vue" />
-        <option value="$PROJECT_DIR$/shop/static/style/main.css" />
         <option value="$PROJECT_DIR$/shop/src/main/resource/application-test.properties" />
         <option value="$PROJECT_DIR$/shop/static/manager/config/prod.env.js" />
         <option value="$PROJECT_DIR$/shop/src/main/resource/templates/shop.html" />
@@ -235,6 +258,11 @@
         <option value="$PROJECT_DIR$/shop/static/js/main.js" />
         <option value="$PROJECT_DIR$/shop/static/style/nHeader.css" />
         <option value="$PROJECT_DIR$/shop/static/style/shop.css" />
+        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java" />
+        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
+        <option value="$PROJECT_DIR$/shop/static/style/main.css" />
+        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java" />
+        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java" />
       </list>
     </option>
   </component>
@@ -264,8 +292,8 @@
     <handled-path value="$PROJECT_DIR$/shop/static/manager/node_modules" />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="368" />
-    <option name="y" value="23" />
+    <option name="x" value="-79" />
+    <option name="y" value="40" />
     <option name="width" value="1440" />
     <option name="height" value="822" />
   </component>
@@ -284,17 +312,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="tjshop" type="58d84e3e:PackageViewProjectNode" />
-              <item name="shop" type="616d4139:PackageViewModuleNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -381,7 +399,7 @@
               <item name="zskk" type="462c0819:PsiDirectoryNode" />
               <item name="shop" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
-              <item name="api" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
@@ -404,44 +422,12 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resource" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
-              <item name="shop" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resource" type="462c0819:PsiDirectoryNode" />
-              <item name="mapper" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
-              <item name="shop" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resource" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
               <item name="tjshop" type="462c0819:PsiDirectoryNode" />
               <item name="shop" type="462c0819:PsiDirectoryNode" />
               <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
-              <item name="shop" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
-              <item name="js" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
-              <item name="shop" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
-              <item name="shop" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
               <item name="tjshop" type="462c0819:PsiDirectoryNode" />
@@ -454,8 +440,18 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="tjshop" type="58d84e3e:PackageViewProjectNode" />
+              <item name="shop" type="616d4139:PackageViewModuleNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
       <pane id="AndroidView" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -639,12 +635,13 @@
       <workItem from="1577240993676" duration="26945000" />
       <workItem from="1577418968701" duration="6485000" />
       <workItem from="1577706672203" duration="8957000" />
-      <workItem from="1577933633701" duration="3071000" />
+      <workItem from="1577933633701" duration="3198000" />
+      <workItem from="1579068546792" duration="1909000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="165730000" />
+    <option name="totallyTimeSpent" value="167766000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -656,11 +653,11 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="368" y="23" width="1440" height="822" extended-state="0" />
+    <frame x="-79" y="40" width="1440" height="822" extended-state="0" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36038515" sideWeight="0.47567955" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3297568" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297568" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Flutter Outline" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.069384836" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -670,18 +667,18 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3933975" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.360274" sideWeight="0.5243205" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.35900962" sideWeight="0.5243205" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22420909" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22603719" sideWeight="0.48895028" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22420909" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22889842" sideWeight="0.48895028" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29685265" sideWeight="0.51104975" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Flutter Inspector" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -690,8 +687,8 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.76076996" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3933975" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -712,41 +709,6 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/ShopConfigService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="38" column="15" lean-forward="false" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/h5/H5IndexController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="74" column="0" lean-forward="false" selection-start-line="61" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/subscribe.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="79" column="0" lean-forward="false" selection-start-line="79" selection-start-column="0" selection-end-line="79" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/newsDetails.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1620">
-          <caret line="108" column="22" lean-forward="false" selection-start-line="108" selection-start-column="22" selection-end-line="108" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/js/num-alignment.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1112">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/resource/mapper/EquipmentMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -790,13 +752,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="284">
-          <caret line="60" column="44" lean-forward="false" selection-start-line="60" selection-start-column="44" selection-end-line="60" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/DoctorMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
@@ -804,25 +759,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="32" column="72" lean-forward="false" selection-start-line="32" selection-start-column="72" selection-end-line="32" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/resource/mapper/DoctorMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="203">
           <caret line="17" column="25" lean-forward="false" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
           <folding>
-            <marker date="1577329686267" expanded="true" signature="387:496" ph="select from doctor" />
-            <marker date="1577329686267" expanded="true" signature="592:684" ph="select from doctor" />
-            <marker date="1577329686267" expanded="true" signature="773:846" ph="select from doctor" />
-            <marker date="1577329686267" expanded="true" signature="934:1006" ph="select from doctor" />
-            <marker date="1577329686267" expanded="true" signature="1094:1307" ph="insert into doctor... " />
-            <marker date="1577329686267" expanded="true" signature="1396:1555" ph="update doctor... " />
-            <marker date="1577329686267" expanded="true" signature="1641:1690" ph="update doctor... " />
+            <marker date="1579070222599" expanded="true" signature="387:495" ph="select from doctor" />
+            <marker date="1579070222599" expanded="true" signature="591:683" ph="select from doctor" />
+            <marker date="1579070222599" expanded="true" signature="772:845" ph="select from doctor" />
+            <marker date="1579070222599" expanded="true" signature="933:1005" ph="select from doctor" />
+            <marker date="1579070222599" expanded="true" signature="1093:1306" ph="insert into doctor... " />
+            <marker date="1579070222599" expanded="true" signature="1395:1554" ph="update doctor... " />
+            <marker date="1579070222599" expanded="true" signature="1640:1689" ph="update doctor... " />
           </folding>
         </state>
       </provider>
@@ -903,20 +851,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1530">
-          <caret line="130" column="0" lean-forward="false" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/DoctorController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="43" column="46" lean-forward="false" selection-start-line="43" selection-start-column="46" selection-end-line="43" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/GoodDescribeBean.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
@@ -931,13 +865,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2850">
-          <caret line="222" column="50" lean-forward="false" selection-start-line="222" selection-start-column="31" selection-end-line="222" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/static/style/setmeal.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3450">
@@ -986,7 +913,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -994,7 +920,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1002,15 +927,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
           <caret line="4" column="36" lean-forward="false" selection-start-line="4" selection-start-column="36" selection-end-line="4" selection-end-column="36" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1026,30 +942,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="6" column="60" lean-forward="false" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="60" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="509">
-          <caret line="284" column="17" lean-forward="false" selection-start-line="284" selection-start-column="17" selection-end-line="284" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/shop/static/style/common.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
-          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="287">
-          <caret line="38" column="14" lean-forward="true" selection-start-line="38" selection-start-column="14" selection-end-line="38" selection-end-column="14" />
+          <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -1057,22 +956,22 @@
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/api/TJCallbackController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
-          <caret line="30" column="14" lean-forward="true" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
+          <caret line="30" column="14" lean-forward="false" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/api/ApiController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="213">
-          <caret line="42" column="14" lean-forward="true" selection-start-line="42" selection-start-column="14" selection-end-line="42" selection-end-column="14" />
+        <state relative-caret-position="240">
+          <caret line="42" column="14" lean-forward="false" selection-start-line="42" selection-start-column="14" selection-end-line="42" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/BuyOrderController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="163">
+        <state relative-caret-position="585">
           <caret line="79" column="30" lean-forward="false" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="30" />
           <folding />
         </state>
@@ -1112,15 +1011,141 @@
     <entry file="file://$PROJECT_DIR$/shop/static/style/nHeader.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
-          <caret line="14" column="25" lean-forward="true" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
+          <caret line="14" column="25" lean-forward="false" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/shop/static/style/shop.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="361">
-          <caret line="56" column="19" lean-forward="false" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
+        <state relative-caret-position="-1718">
+          <caret line="48" column="24" lean-forward="false" selection-start-line="48" selection-start-column="24" selection-end-line="48" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/SysLabelService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="249">
+          <caret line="55" column="31" lean-forward="true" selection-start-line="55" selection-start-column="31" selection-end-line="55" selection-end-column="31" />
+          <folding>
+            <element signature="e#1437#1438#0" expanded="false" />
+            <element signature="e#1497#1498#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/SysLabelMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="28" column="44" lean-forward="false" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/GoodMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <caret line="54" column="43" lean-forward="false" selection-start-line="54" selection-start-column="26" selection-end-line="54" selection-end-column="43" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/mapper/GoodMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="439">
+          <caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="21" />
+          <folding>
+            <marker date="1575454051197" expanded="true" signature="286:403" ph="select id, g... good_ad" />
+            <marker date="1575454051197" expanded="true" signature="489:613" ph="insert into good_ad... " />
+            <marker date="1575454051197" expanded="true" signature="702:795" ph="update good_ad... " />
+            <marker date="1575454051197" expanded="true" signature="834:868" ph="delete from good_ad... " />
+            <marker date="1575454051197" expanded="true" signature="928:1028" ph="select gid, " />
+            <marker date="1575454051197" expanded="true" signature="2615:2764" ph="insert into good_base... " />
+            <marker date="1575454051197" expanded="true" signature="2857:2979" ph="update good_base... " />
+            <marker date="1575454051197" expanded="true" signature="3020:3066" ph="update good_base... " />
+            <marker date="1575454051197" expanded="true" signature="3156:3246" ph="update good_base... " />
+            <marker date="1575454051197" expanded="true" signature="3308:3357" ph="select id, g... " />
+            <marker date="1575454051197" expanded="true" signature="3636:3767" ph="insert into good_describe... " />
+            <marker date="1575454051197" expanded="true" signature="3868:3969" ph="update good_describe... " />
+            <marker date="1575454051197" expanded="true" signature="4018:4060" ph="delete from good_describe... " />
+            <marker date="1575454051197" expanded="true" signature="4119:4228" ph="select id, g... " />
+            <marker date="1575454051197" expanded="true" signature="4489:4710" ph="INSERT INTO `good_price`... " />
+            <marker date="1575454051197" expanded="true" signature="4806:4967" ph="update good_price... " />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="335">
+          <caret line="44" column="28" lean-forward="false" selection-start-line="44" selection-start-column="28" selection-end-line="44" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="43" column="13" lean-forward="false" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="401">
+          <caret line="151" column="58" lean-forward="false" selection-start-line="151" selection-start-column="58" selection-end-line="151" selection-end-column="58" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application-dev.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="217">
+          <caret line="293" column="16" lean-forward="false" selection-start-line="293" selection-start-column="16" selection-end-line="293" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/DoctorController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-16">
+          <caret line="43" column="46" lean-forward="false" selection-start-line="43" selection-start-column="46" selection-end-line="43" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="169">
+          <caret line="69" column="5" lean-forward="false" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
+          <folding>
+            <element signature="e#1331#1332#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="92">
+          <caret line="32" column="59" lean-forward="false" selection-start-line="32" selection-start-column="59" selection-end-line="32" selection-end-column="59" />
           <folding />
         </state>
       </provider>

shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java

@@ -26,13 +26,13 @@ public class DoctorManageController extends AbstractController {
 
 	@Autowired
 	private DoctorService doctorService;
-	
+
 	@RequestMapping("/list")
 	@ResponseBody
 	public ControllerResult list(){
-		return new ControllerResult(doctorService.queryAllOnlineDoctors());
+		return new ControllerResult(doctorService.queryAllDoctors());
 	}
-	
+
 	@RequestMapping("/get")
 	@ResponseBody
 	public ControllerResult get(@RequestParam("id") Integer id){
@@ -42,8 +42,8 @@ public class DoctorManageController extends AbstractController {
 	@RequestMapping("/save")
 	@ResponseBody
 	public ControllerResult save(@RequestParam("id") Integer id, @RequestParam("name") String name,
-								 @RequestParam("title") String title, @RequestParam("icon") String icon, @RequestParam("department") String department,
-								 @RequestParam("hospital") String hospital, @RequestParam("describe") String describe, @RequestParam("sort") Integer sort){
+									@RequestParam("title") String title, @RequestParam("icon") String icon, @RequestParam("department") String department,
+									@RequestParam("hospital") String hospital, @RequestParam("describe") String describe, @RequestParam("sort") Integer sort){
 		if (id.equals(0)){
 			doctorService.addDoctor(name, title, icon, department, hospital, describe, sort);
 		}else{

shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java

@@ -149,7 +149,9 @@ public class IndexController extends AbstractController {
 			} else  {
 				price.setDiscount(price.getDiscountPrice().divide(price.getPrice(), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(10)));
 			}
-			beans.add(goodService.toSimpleGoodBean(base, price));
+			if(beans.size() < GoodService.GOOD_MAX_NUMBER) {
+				beans.add(goodService.toSimpleGoodBean(base, price));
+			}
 		}
 		return beans;
 	}

shop/src/main/java/com/zskk/shop/dao/DoctorMapper.java

@@ -17,6 +17,8 @@ public interface DoctorMapper {
 
 	public List<Doctor> queryAllOnlineDoctors();
 
+	public List<Doctor> queryAllDoctors();
+
 	public Doctor queryOneDoctor(Integer id);
 
 	public void addDoctor(Doctor doctor);

shop/src/main/java/com/zskk/shop/service/DoctorService.java

@@ -54,13 +54,21 @@ public class DoctorService {
 	}
 	
 	/**
-	 * 查询全部banner
+	 * 查询全部线上医生
 	 * @return
 	 */
 	public List<Doctor> queryAllOnlineDoctors(){
 		return doctorMapper.queryAllOnlineDoctors();
 	}
 	
+	/**
+	 * 查询全部医生
+	 * @return
+	 */
+	public List<Doctor> queryAllDoctors(){
+		return doctorMapper.queryAllDoctors();
+	}
+	
 	/**
 	 * 获取单个banner
 	 * @param id

shop/src/main/java/com/zskk/shop/service/GoodService.java

@@ -39,7 +39,11 @@ public class GoodService {
 	 * 商品下线
 	 */
 	public static final Integer GOOD_OFFLINE = 0;
-	
+
+	/**
+	 * 首页商品数量
+	 */
+	public  static  final  Integer GOOD_MAX_NUMBER = 8;
 	
 	@Autowired
 	private GoodMapper goodMapper;

shop/src/main/resource/mapper/DoctorMapper.xml

@@ -7,7 +7,7 @@
 	<select id="queryOnlineDoctors" resultType="com.zskk.shop.dao.entry.Doctor">
 		select <include refid="select"></include>
 		from doctor
-		where status=1 
+		where status=1
 		order by sort asc limit #{number}
 	</select>