merge_develop

.idea/workspace.xml

@@ -5,31 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f4dc82b3-ff8e-4683-8d94-679b27583f09" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/db/platform_kuaishou_user.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/db/finance.go" beforeDir="false" afterPath="$PROJECT_DIR$/db/finance.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/db/logistics.go" beforeDir="false" afterPath="$PROJECT_DIR$/db/logistics.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/db/operate.go" beforeDir="false" afterPath="$PROJECT_DIR$/db/operate.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/db/sectask.go" beforeDir="false" afterPath="$PROJECT_DIR$/db/sectask.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/db/selection.go" beforeDir="false" afterPath="$PROJECT_DIR$/db/selection.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/handler/CreateSecTaskLogistics.go" beforeDir="false" afterPath="$PROJECT_DIR$/handler/CreateSecTaskLogistics.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/handler/GetSecTaskList.go" beforeDir="false" afterPath="$PROJECT_DIR$/handler/GetSecTaskList.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/handler/PassSecTaskCoop.go" beforeDir="false" afterPath="$PROJECT_DIR$/handler/PassSecTaskCoop.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/handler/RefuseSecTaskCoop.go" beforeDir="false" afterPath="$PROJECT_DIR$/handler/RefuseSecTaskCoop.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/handler/SettleSecTask.go" beforeDir="false" afterPath="$PROJECT_DIR$/handler/SettleSecTask.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/handler/UpdateSecTaskLogistics.go" beforeDir="false" afterPath="$PROJECT_DIR$/handler/UpdateSecTaskLogistics.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/model/gorm_model/selection_info.go" beforeDir="false" afterPath="$PROJECT_DIR$/model/gorm_model/selection_info.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/model/gorm_model/selection_task_info.go" beforeDir="false" afterPath="$PROJECT_DIR$/model/gorm_model/selection_task_info.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/model/http_model/CreateSecTaskLogisticsRequest.go" beforeDir="false" afterPath="$PROJECT_DIR$/model/http_model/CreateSecTaskLogisticsRequest.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/model/http_model/GetSecTaskListRequest.go" beforeDir="false" afterPath="$PROJECT_DIR$/model/http_model/GetSecTaskListRequest.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/model/http_model/PassSecTaskCoopRequest.go" beforeDir="false" afterPath="$PROJECT_DIR$/model/http_model/PassSecTaskCoopRequest.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/model/http_model/RefuseSecTaskCoopRequest.go" beforeDir="false" afterPath="$PROJECT_DIR$/model/http_model/RefuseSecTaskCoopRequest.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pack/sec_task_list.go" beforeDir="false" afterPath="$PROJECT_DIR$/pack/sec_task_list.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/route/init.go" beforeDir="false" afterPath="$PROJECT_DIR$/route/init.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/logistics.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/logistics.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/sec_task.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/sec_task.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/sec_task_logistics.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/sec_task_logistics.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/selection.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/selection.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -72,7 +48,7 @@
     &quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.go.modules.automatic.dependencies.download&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.go.modules.go.list.on.any.changes.was.set&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;develop&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;XxY&quot;,
     &quot;go.import.settings.migrated&quot;: &quot;true&quot;,
     &quot;go.sdk.automatically.set&quot;: &quot;true&quot;,
     &quot;last_opened_file_path&quot;: &quot;C:/Users/XingYuXian&quot;,