Merge remote-tracking branch 'origin/master'

.idea/workspace.xml

@@ -3,10 +3,17 @@
   <component name="ChangeListManager">
     <list default="true" id="7aa7cc45-aece-4fa3-9063-5e3df12471b4" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+<<<<<<< .mine
+
+
+
+
+=======
       <change beforePath="$PROJECT_DIR$/XT_Admin_Api.exe" beforeDir="false" afterPath="$PROJECT_DIR$/XT_Admin_Api.exe" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/service/function_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/function_service.go" afterDir="false" />
+>>>>>>> .theirs
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -20,7 +27,11 @@
       <file leaf-file-name="function_api_router_register.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
           <provider selected="true" editor-type-id="text-editor">
+<<<<<<< .mine
+            <state relative-caret-position="1848">
+=======
             <state relative-caret-position="47">
+>>>>>>> .theirs
               <caret line="87" column="79" selection-start-line="87" selection-start-column="54" selection-end-line="87" selection-end-column="79" />
               <folding>
                 <element signature="e#34#79#0" expanded="true" />
@@ -41,8 +52,13 @@
       <file leaf-file-name="function_service.go" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/service/function_service.go">
           <provider selected="true" editor-type-id="text-editor">
+<<<<<<< .mine
+            <state relative-caret-position="175">
+              <caret line="65" column="138" selection-start-line="65" selection-start-column="122" selection-end-line="65" selection-end-column="138" />
+=======
             <state relative-caret-position="296">
               <caret line="137" column="248" selection-start-line="137" selection-start-column="248" selection-end-line="137" selection-end-column="248" />
+>>>>>>> .theirs
               <folding>
                 <element signature="e#17#73#0" expanded="true" />
               </folding>
@@ -50,6 +66,63 @@
           </provider>
         </entry>
       </file>
+<<<<<<< .mine
+      <file leaf-file-name="admin_api_router_register.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="528">
+              <caret line="24" column="62" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="62" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="org_api_controller.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/org_api_controller.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="5962">
+              <caret line="278" column="72" selection-start-line="278" selection-start-column="47" selection-end-line="278" selection-end-column="72" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="org_service.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/service/org_service.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="12298">
+              <caret line="566" column="267" selection-start-line="566" selection-start-column="176" selection-end-line="566" selection-end-column="267" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
       <file leaf-file-name="fuction_query_models.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
           <provider selected="true" editor-type-id="text-editor">
@@ -229,7 +302,11 @@
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
     <layout>
+<<<<<<< .mine
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22050938" />
+=======
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20710456" />
+>>>>>>> .theirs
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.113270774" side_tool="true" visible="true" weight="0.39372325" />
       <window_info anchor="right" id="Database" order="3" />
@@ -237,7 +314,11 @@
       <window_info anchor="bottom" id="Version Control" order="9" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+<<<<<<< .mine
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.88538873" visible="true" weight="0.0014265336" />
+=======
       <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.88672924" visible="true" weight="0.39372325" />
+>>>>>>> .theirs
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -613,9 +694,72 @@
         </state>
       </provider>
     </entry>
+<<<<<<< .mine
+    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="11264">
+          <caret line="512" column="5" selection-start-line="512" selection-start-column="5" selection-end-line="512" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="528">
+          <caret line="24" column="62" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="62" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/org_api_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5962">
+          <caret line="278" column="72" selection-start-line="278" selection-start-column="47" selection-end-line="278" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/service/org_service.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="12298">
+          <caret line="566" column="267" selection-start-line="566" selection-start-column="176" selection-end-line="566" selection-end-column="267" />
+        </state>
+      </provider>
+    </entry>
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
     <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< .mine
+        <state relative-caret-position="1848">
+=======
         <state relative-caret-position="47">
+>>>>>>> .theirs
           <caret line="87" column="79" selection-start-line="87" selection-start-column="54" selection-end-line="87" selection-end-column="79" />
           <folding>
             <element signature="e#34#79#0" expanded="true" />
@@ -625,8 +769,13 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/service/function_service.go">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< .mine
+        <state relative-caret-position="175">
+          <caret line="65" column="138" selection-start-line="65" selection-start-column="122" selection-end-line="65" selection-end-column="138" />
+=======
         <state relative-caret-position="296">
           <caret line="137" column="248" selection-start-line="137" selection-start-column="248" selection-end-line="137" selection-end-column="248" />
+>>>>>>> .theirs
           <folding>
             <element signature="e#17#73#0" expanded="true" />
           </folding>