Merge branch 'shine' of https://gitee.com/ladeng07/ITShowPlatform

Conflicts: Apps/enroll/admin.py ITShowPlatform/.gitignore
2022-05-05 23:12:26 +08:00
parent 11d93d2edd bbd4691646
commit 12f390949b
20 changed files with 336 additions and 8 deletions
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="dataSourceStorageLocal">
+    <data-source name="ITStudio@localhost" uuid="f9570fba-eba2-4840-bc3f-b898c3fabd4c">
+      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
+      <secret-storage>forget</secret-storage>
+      <schema-mapping />
+    </data-source>
+  </component>
+</project>
@@ -0,0 +1,4 @@
+<changelist name="在Update之前未提交更改_at_2022_5_5_22_17_[Default_Changelist]" date="1651760302590" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在Update之前未提交更改_at_2022_5_5_22_17_[Default_Changelist]/shelved.patch" />
+  <option name="DESCRIPTION" value="在Update之前未提交更改 at 2022/5/5 22:17 [Default Changelist]" />
+</changelist>