Prechádzať zdrojové kódy

修改富文本内容大小 最大 200M

fuyu 5 rokov pred
rodič
commit
d2e0640088

+ 134 - 934
.idea/workspace.xml

@@ -2,12 +2,10 @@
 <project version="4">
   <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/pc/IndexController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/NewsManagerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/NewsManagerController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/resource/application.properties" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/shop/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -28,130 +26,6 @@
   <component name="FavoritesManager">
     <favorites_list name="tjshop" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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="405">
-              <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="IndexController.java" pinned="false" current-in-tab="true">
-        <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="62" column="80" lean-forward="false" selection-start-line="62" selection-start-column="80" selection-end-line="62" selection-end-column="80" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="4485">
-              <caret line="299" column="1" lean-forward="false" selection-start-line="299" selection-start-column="1" selection-end-line="299" selection-end-column="1" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="main.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="69" column="33" lean-forward="false" selection-start-line="69" selection-start-column="33" selection-end-line="69" selection-end-column="33" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="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" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DoctorManageController.java" pinned="false" current-in-tab="false">
-        <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="225">
-              <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="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="660">
-              <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#1287#1288#0" expanded="true" />
-                <element signature="e#1331#1332#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="390">
-              <caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="390">
-              <caret line="26" column="33" lean-forward="false" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="33" />
-              <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>
-      <file leaf-file-name="GoodMapper.java" pinned="false" current-in-tab="false">
-        <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="615">
-              <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>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -160,296 +34,37 @@
       </list>
     </option>
   </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>bigweixin</find>
-      <find>queryAllOnlineDoctors</find>
-      <find>alldocter</find>
-      <find>specialist</find>
-      <find>s-subnav dt</find>
-      <find>loginregister</find>
-      <find>button</find>
-      <find>add-cart</find>
-      <find>updateNewBase</find>
-      <find>s-list</find>
-      <find>ShopConfigService</find>
-      <find>recommands</find>
-      <find>images</find>
-      <find>image</find>
-      <find>zskk-service</find>
-      <find>swiper-slide</find>
-      <find>phone</find>
-      <find>zskk-phone</find>
-      <find>zskk-label</find>
-      <find>u2</find>
-      <find>tjorders</find>
-      <find>subnav l mt20</find>
-      <find>list-style-type:none;</find>
-      <find>click</find>
-      <find>zskk-weixin</find>
-      <find>.add</find>
-      <find>zskk-bg-</find>
-      <find>.swiper-slide .title</find>
-      <find>queryAllGoodBases</find>
-      <find>shop</find>
-    </findStrings>
-    <replaceStrings>
-      <replace />
-    </replaceStrings>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <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" />
-        <option value="$PROJECT_DIR$/shop/static/style/swiper.min.css" />
-        <option value="$PROJECT_DIR$/shop/static/style/inquire.css" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorController.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/NewLabelController.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/NewBean.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/NewsController.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/page.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/NewLabel.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/PageBean.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/resource/templates/fragments.html.bck" />
-        <option value="$PROJECT_DIR$/shop/src/main/resource/mapper/NewLabelMapper.xml" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/NewLabelService.java" />
-        <option value="$PROJECT_DIR$/shop/static/style/newsDetails.css" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/BottomPageBean.java" />
-        <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/dao/DoctorMapper.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" />
-        <option value="$PROJECT_DIR$/shop/static/style/news.css" />
-        <option value="$PROJECT_DIR$/shop/static/style/smallBanner.css" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/InfoController.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/NewService.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/NewController.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/NewMapper.java" />
-        <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/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/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" />
-        <option value="$PROJECT_DIR$/shop/static/style/common.css" />
-        <option value="$PROJECT_DIR$/shop/static/style/user.css" />
-        <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/service/DoctorService.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java" />
-        <option value="$PROJECT_DIR$/shop/static/style/main.css" />
-        <option value="$PROJECT_DIR$/shop/static/js/main.js" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
-      </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>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="shop" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="shop" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="NodeModulesDirectoryManager">
-    <handled-path value="$PROJECT_DIR$/shop/static/manager/node_modules" />
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="120" />
-    <option name="y" value="32" />
-    <option name="width" value="1440" />
-    <option name="height" value="823" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <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="AndroidView" />
-      <pane id="Scope" />
-      <pane id="Scratches" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
-              <item name="shop" 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" />
-            </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" />
-            </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="java" 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="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" 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="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="zskk" 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="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="zskk" type="462c0819:PsiDirectoryNode" />
-              <item name="shop" 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="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="zskk" type="462c0819:PsiDirectoryNode" />
-              <item name="shop" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" 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="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="zskk" type="462c0819:PsiDirectoryNode" />
-              <item name="shop" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" 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" />
-            </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>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
+  <component name="ProjectId" id="1ZFynnO4WuO8AWosiAXAZBzcvpb" />
+  <component name="ProjectViewState">
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="settings.editor.selected.configurable" value="configurable.group.editor" />
+    <property name="RequestMappingsPanelOrder0" value="0" />
+    <property name="RequestMappingsPanelOrder1" value="1" />
+    <property name="RequestMappingsPanelOrder2" value="2" />
+    <property name="RequestMappingsPanelWidth0" value="75" />
+    <property name="RequestMappingsPanelWidth1" value="75" />
+    <property name="RequestMappingsPanelWidth2" value="75" />
+    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/fuyu/zskk_code/kunlun/tjshop/shop/src/main/java/com/zskk/shop/service/EquipmentService.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.detected.package.tslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.tslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
-    <property name="RequestMappingsPanelWidth0" value="75" />
-    <property name="RequestMappingsPanelOrder0" value="0" />
-    <property name="RequestMappingsPanelWidth1" value="75" />
-    <property name="RequestMappingsPanelOrder1" value="1" />
-    <property name="RequestMappingsPanelWidth2" value="75" />
-    <property name="RequestMappingsPanelOrder2" value="2" />
+    <property name="settings.editor.selected.configurable" value="configurable.group.editor" />
     <property name="show.migrate.to.gradle.popup" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/fuyu/zskk_code/kunlun/tjshop/shop/src/main/java/com/zskk/shop/service/EquipmentService.java" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -463,18 +78,6 @@
       <recent name="$PROJECT_DIR$/shop/src/main/resource/mapper" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="RunManager">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false" />
@@ -484,99 +87,55 @@
       <module />
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
       <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+      <module name="shop" />
+      <extension name="coverage">
         <pattern>
           <option name="PATTERN" value="com.zskk.shop.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.zskk.shop.Application" />
-      <module name="shop" />
-      <envs />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
+    <configuration default="true" type="TestNG">
       <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
       <properties />
       <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType">
       <module name="" />
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
       <option name="PROGRAM_PARAMETERS" />
-      <predefined_log_file id="idea.log" enabled="true" />
+      <predefined_log_file enabled="true" id="idea.log" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <recent_temporary>
-      <list size="1">
-        <item index="0" class="java.lang.String" itemvalue="Spring Boot.Application" />
+      <list>
+        <item itemvalue="Spring Boot.Application" />
       </list>
     </recent_temporary>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -619,461 +178,102 @@
       <workItem from="1579073948519" duration="1104000" />
       <workItem from="1579153318820" duration="21000" />
       <workItem from="1579242767300" duration="1660000" />
-      <workItem from="1579244519607" duration="97000" />
+      <workItem from="1579244519607" duration="792000" />
+      <workItem from="1581588162372" duration="19000" />
+      <workItem from="1581588202531" duration="165000" />
+      <workItem from="1581589161098" duration="43000" />
+      <workItem from="1581589244540" duration="146000" />
+      <workItem from="1581615955132" duration="15000" />
+      <workItem from="1584449307710" duration="88000" />
+      <workItem from="1584497510688" duration="828000" />
+      <workItem from="1584499814688" duration="2000" />
+      <workItem from="1584501134115" duration="41000" />
+      <workItem from="1585358377827" duration="601000" />
+      <workItem from="1585360101476" duration="893000" />
+      <workItem from="1585363132015" duration="1022000" />
+      <workItem from="1585463032539" duration="590000" />
+      <workItem from="1585555338136" duration="1722000" />
+      <workItem from="1585557305130" duration="1742000" />
+      <workItem from="1585559119845" duration="1102000" />
     </task>
     <servers />
   </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="170648000" />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1440" height="826" extended-state="6" />
-    <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="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" />
-      <window_info id="Database" 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="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24931256" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <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.35841313" 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.22298221" 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.24034335" 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="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" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
-      <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="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">
     <option name="version" value="1" />
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager />
-    <watches-manager />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-    <buildFile url="file://$PROJECT_DIR$/shop/pom.xml">
-      <expanded value="true" />
-    </buildFile>
-  </component>
-  <component name="editorHistoryManager">
-    <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">
-          <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/NewLabelMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="74">
-          <caret line="37" column="24" lean-forward="false" selection-start-line="37" selection-start-column="24" selection-end-line="37" selection-end-column="24" />
-        </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">
-          <caret line="17" column="46" lean-forward="false" selection-start-line="17" selection-start-column="46" selection-end-line="17" selection-end-column="46" />
-        </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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/news.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="328">
-          <caret line="178" column="0" lean-forward="false" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/smallBanner.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/nav_bg.png">
-      <provider selected="true" editor-type-id="images">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/InfoController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="38" column="45" lean-forward="false" selection-start-line="38" selection-start-column="45" selection-end-line="38" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/specialist.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
-          <caret line="180" column="0" lean-forward="false" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/NewController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="141" column="56" lean-forward="false" selection-start-line="141" selection-start-column="56" selection-end-line="141" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/NewService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2625">
-          <caret line="207" column="27" lean-forward="false" selection-start-line="207" selection-start-column="27" selection-end-line="207" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/NewMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1155">
-          <caret line="87" column="30" lean-forward="false" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/mapper/NewMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/AbstractController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1710">
-          <caret line="154" column="45" lean-forward="false" selection-start-line="154" selection-start-column="45" selection-end-line="154" selection-end-column="45" />
-        </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">
-          <caret line="33" column="11" lean-forward="false" selection-start-line="33" selection-start-column="11" selection-end-line="33" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/GoodBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="8" column="38" lean-forward="false" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
-        </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">
-          <caret line="230" column="0" lean-forward="false" selection-start-line="230" selection-start-column="0" selection-end-line="230" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/doctors.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1185">
-          <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/manager/src/components/page/NewsManager.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="705">
-          <caret line="47" column="40" lean-forward="false" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/manager/src/components/Sidebar.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="43" column="0" lean-forward="false" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application-prod.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" column="37" lean-forward="false" selection-start-line="25" selection-start-column="37" selection-end-line="25" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/logback-spring-dev.xml">
-      <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/manager/config/index.js">
-      <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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/manager/config/dev.env.js">
-      <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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/manager/config/prod.env.js">
-      <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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application-test.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="37" lean-forward="false" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/templates/shop.html">
-      <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" />
-        </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="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <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="false" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
-        </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="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" />
-        </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="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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/u_subnav_icon.fw.png">
-      <provider selected="true" editor-type-id="images">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/user.css">
-      <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>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/images/erweimafooter.png">
-      <provider selected="true" editor-type-id="images">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/images/erweima.png">
-      <provider selected="true" editor-type-id="images">
-        <state />
-      </provider>
-    </entry>
-    <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="false" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
-        </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="-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" />
-        </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" />
-        </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" />
-        </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/src/main/java/com/zskk/shop/service/DoctorService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="660">
-          <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#1287#1288#0" expanded="true" />
-            <element signature="e#1331#1332#0" expanded="true" />
-          </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="4485">
-          <caret line="299" column="1" lean-forward="false" selection-start-line="299" selection-start-column="1" selection-end-line="299" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="69" column="33" lean-forward="false" selection-start-line="69" selection-start-column="33" selection-end-line="69" selection-end-column="33" />
-          <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="615">
-          <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="390">
-          <caret line="26" column="33" lean-forward="false" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="33" />
-          <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/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" />
-          <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="225">
-          <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>
-    <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="405">
-          <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="390">
-          <caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
-          <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="15">
-          <caret line="62" column="80" lean-forward="false" selection-start-line="62" selection-start-column="80" selection-end-line="62" selection-end-column="80" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
+  <component name="WindowStateProjectService">
+    <state x="184" y="96" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1584449391479">
+      <screen x="0" y="23" width="1440" height="822" />
+    </state>
+    <state x="184" y="96" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1440.822@0.23.1440.822" timestamp="1584449391479" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom" timestamp="1585560222114">
+      <screen x="0" y="23" width="1440" height="829" />
+    </state>
+    <state width="1398" height="232" key="GridCell.Tab.0.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585559250784" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585559832318" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560222114" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center" timestamp="1585560222113">
+      <screen x="0" y="23" width="1440" height="829" />
+    </state>
+    <state width="1398" height="232" key="GridCell.Tab.0.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827@0.23.1440.827" timestamp="1585559250783" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828@0.23.1440.828" timestamp="1585559832317" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.829@0.23.1440.829" timestamp="1585560222113" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left" timestamp="1585560222113">
+      <screen x="0" y="23" width="1440" height="829" />
+    </state>
+    <state width="1398" height="232" key="GridCell.Tab.0.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827@0.23.1440.827" timestamp="1585559250783" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828@0.23.1440.828" timestamp="1585559832316" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.829@0.23.1440.829" timestamp="1585560222113" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right" timestamp="1585560222114">
+      <screen x="0" y="23" width="1440" height="829" />
+    </state>
+    <state width="1398" height="232" key="GridCell.Tab.0.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827@0.23.1440.827" timestamp="1585559250784" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828@0.23.1440.828" timestamp="1585559832317" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.829@0.23.1440.829" timestamp="1585560222114" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom" timestamp="1585560222116">
+      <screen x="0" y="23" width="1440" height="829" />
+    </state>
+    <state width="1398" height="232" key="GridCell.Tab.1.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485991" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585559250786" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585559832319" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560222116" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center" timestamp="1585560222115">
+      <screen x="0" y="23" width="1440" height="829" />
+    </state>
+    <state width="1398" height="232" key="GridCell.Tab.1.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485990" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.827@0.23.1440.827" timestamp="1585559250785" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.828@0.23.1440.828" timestamp="1585559832318" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.829@0.23.1440.829" timestamp="1585560222115" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left" timestamp="1585560222115">
+      <screen x="0" y="23" width="1440" height="829" />
+    </state>
+    <state width="1398" height="232" key="GridCell.Tab.1.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485990" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.827@0.23.1440.827" timestamp="1585559250785" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.828@0.23.1440.828" timestamp="1585559832318" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.829@0.23.1440.829" timestamp="1585560222115" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right" timestamp="1585560222115">
+      <screen x="0" y="23" width="1440" height="829" />
+    </state>
+    <state width="1398" height="232" key="GridCell.Tab.1.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485991" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.827@0.23.1440.827" timestamp="1585559250785" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.828@0.23.1440.828" timestamp="1585559832319" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.829@0.23.1440.829" timestamp="1585560222115" />
+    <state x="794" y="313" key="com.intellij.ide.util.TipDialog" timestamp="1585557324210">
+      <screen x="0" y="23" width="1440" height="827" />
+    </state>
+    <state x="794" y="312" key="com.intellij.ide.util.TipDialog/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1584499814791" />
+    <state x="794" y="313" key="com.intellij.ide.util.TipDialog/0.23.1440.827@0.23.1440.827" timestamp="1585557324210" />
+    <state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.829@0.23.1440.829" timestamp="1585363207913" />
+    <state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.830@0.23.1440.830" timestamp="1585360101388" />
+    <state x="520" y="85" width="837" height="550" key="find.popup" timestamp="1585556808136">
+      <screen x="0" y="23" width="1440" height="827" />
+    </state>
+    <state x="520" y="85" width="837" height="550" key="find.popup/0.23.1440.827@0.23.1440.827" timestamp="1585556808136" />
+    <state x="603" y="159" width="837" height="550" key="find.popup/0.23.1440.830@0.23.1440.830" timestamp="1585360905858" />
   </component>
   <component name="masterDetails">
     <states>

+ 3 - 3
shop/src/main/java/com/zskk/shop/controller/admin/NewsManagerController.java

@@ -73,9 +73,9 @@ public class NewsManagerController 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("time") String time,
-								 @RequestParam("html") String html, @RequestParam("describe") String describe, @RequestParam("sort") Integer sort, @RequestParam("wacth") Integer wacth ){
+	public ControllerResult save(@RequestParam(name = "id", required=false) Integer id, @RequestParam(name = "name", required=false) String name,
+								 @RequestParam(name = "title", required=false) String title, @RequestParam(name = "icon", required=false) String icon, @RequestParam(name = "time", required=false) String time,
+								 @RequestParam(name = "html", required=false) String html, @RequestParam(name = "describe", required=false) String describe, @RequestParam(name = "sort", required=false) Integer sort, @RequestParam(name = "wacth", required=false) Integer wacth ){
 		if (id.equals(0)){
 			newService.addNew(name, title, icon, time, html, describe, sort, wacth);
 		}else{

+ 2 - 0
shop/src/main/resource/application.properties

@@ -3,6 +3,8 @@ spring.profiles.active=dev
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.zskk.shop.dao.entry
 
+server.max-http-post-size=209715200
+
 spring.thymeleaf.cache=false
 spring.thymeleaf.prefix=classpath:/templates
 spring.thymeleaf.check-template-location=true