客户表

22f56acd · manxiaoqiang · 7f1719c6 · 22f56acd · 22f56acd
Commit 22f56acd authored Mar 29, 2018 by manxiaoqiang
Show whitespace changes
Inline Side-by-side

Showing with 29 additions and 30 deletions

workspace.xml .idea/workspace.xml +28 -29

TkioAccountController.java src/main/java/tkio/controller/TkioAccountController.java +1 -1

No files found.
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,7 @@
  <component name="ChangeListManager">
    <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
    </list>
    <ignored path="$PROJECT_DIR$/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -25,11 +24,11 @@
  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="161">
-              <caret line="31" column="51" lean-forward="false" selection-start-line="31" selection-start-column="51" selection-end-line="31" selection-end-column="51" />
+            <state relative-caret-position="253">
+              <caret line="35" column="71" lean-forward="true" selection-start-line="35" selection-start-column="71" selection-end-line="35" selection-end-column="71" />
              <folding />
            </state>
          </provider>
@@ -45,11 +44,11 @@
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-507">
-              <caret line="44" column="19" lean-forward="true" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="19" />
+            <state relative-caret-position="183">
+              <caret line="77" column="63" lean-forward="true" selection-start-line="77" selection-start-column="63" selection-end-line="77" selection-end-column="63" />
              <folding />
            </state>
          </provider>
@@ -179,9 +178,9 @@
        <option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
        <option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
        <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
      </list>
    </option>
  </component>
@@ -1031,14 +1030,7 @@
      <workItem from="1517533917524" duration="7763000" />
      <workItem from="1517902340876" duration="6159000" />
      <workItem from="1522052551509" duration="6896000" />
-      <workItem from="1522202547904" duration="5972000" />
-    </task>
-    <task id="LOCAL-00051" summary="合同">
-      <created>1516611136767</created>
-      <option name="number" value="00051" />
-      <option name="presentableId" value="LOCAL-00051" />
-      <option name="project" value="LOCAL" />
-      <updated>1516611136768</updated>
+      <workItem from="1522202547904" duration="7035000" />
    </task>
    <task id="LOCAL-00052" summary="合同">
      <created>1516671393123</created>
@@ -1376,11 +1368,18 @@
      <option name="project" value="LOCAL" />
      <updated>1522293168587</updated>
    </task>
-    <option name="localTasksCounter" value="100" />
+    <task id="LOCAL-00100" summary="客户表&#10;&#10;&#10;">
+      <created>1522293869348</created>
+      <option name="number" value="00100" />
+      <option name="presentableId" value="LOCAL-00100" />
+      <option name="project" value="LOCAL" />
+      <updated>1522293869348</updated>
+    </task>
+    <option name="localTasksCounter" value="101" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="356402000" />
+    <option name="totallyTimeSpent" value="357465000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -1889,14 +1888,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="31" column="51" lean-forward="false" selection-start-line="31" selection-start-column="51" selection-end-line="31" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.5.1.RELEASE/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="263">
@@ -1915,8 +1906,16 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-507">
-          <caret line="44" column="19" lean-forward="true" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="19" />
+        <state relative-caret-position="183">
+          <caret line="77" column="63" lean-forward="true" selection-start-line="77" selection-start-column="63" selection-end-line="77" selection-end-column="63" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="35" column="71" lean-forward="true" selection-start-line="35" selection-start-column="71" selection-end-line="35" selection-end-column="71" />
          <folding />
        </state>
      </provider>

--- a/src/main/java/tkio/controller/TkioAccountController.java
+++ b/src/main/java/tkio/controller/TkioAccountController.java
@@ -33,7 +33,7 @@ public class TkioAccountController {
    }

    //sale
-    @RequestMapping(value = "/update/sale", method = RequestMethod.GET)
+    @RequestMapping(value = "/update/sale", method = RequestMethod.PUT)
    @ResponseBody
    public ResultModel updateSale(@CurrentAccount User loginAccount,
                                  @RequestParam String email, @RequestParam String accountEmail) {