Merge branch 'test'

Merge branch 'dev' into test
2024-03-08 17:59:07 +08:00 · 2024-03-08 17:52:24 +08:00 · 2024-03-07 18:57:32 +08:00 · 2024-01-31 23:00:16 +08:00 · 2024-01-31 22:59:50 +08:00 · 2024-01-27 14:13:25 +08:00
3 changed files with 19 additions and 0 deletions
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -36,7 +36,10 @@
        <option name="INDENT_SIZE" value="2" />
        <option name="CONTINUATION_INDENT_SIZE" value="2" />
        <option name="TAB_SIZE" value="2" />
+<<<<<<< HEAD
+=======
        <option name="SMART_TABS" value="true" />
+>>>>>>> test
      </indentOptions>
    </codeStyleSettings>
    <codeStyleSettings language="JavaScript">
--- a/.idea/jdt-admin.iml
+++ b/.idea/jdt-admin.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,11 @@
 <project version="4">
  <component name="ProjectModuleManager">
    <modules>
+<<<<<<< HEAD
+      <module fileurl="file://$PROJECT_DIR$/.idea/jdt-admin.iml" filepath="$PROJECT_DIR$/.idea/jdt-admin.iml" />
+=======
      <module fileurl="file://$PROJECT_DIR$/.idea/admin.iml" filepath="$PROJECT_DIR$/.idea/admin.iml" />
+>>>>>>> test
    </modules>
  </component>
 </project>
Author	SHA1	Message	Date
YuanHuakk	77c7b1e8b9	Merge branch 'test'	2024-03-08 17:59:07 +08:00
YuanHuakk	b027215afa	Merge branch 'dev' into test	2024-03-08 17:52:24 +08:00
YuanHuakk	165149e0c2	Merge branch 'dev' into test	2024-03-07 18:57:32 +08:00
YuanHuakk	f5d75820d7	Merge branch 'test'	2024-01-31 23:00:16 +08:00
YuanHuakk	373e25cf82	Merge branch 'dev' into test	2024-01-31 22:59:50 +08:00
YuanHuakk	6279e8c692	Merge branch 'test'	2024-01-27 14:13:25 +08:00
YuanHuakk	ce68556827	Merge branch 'dev' into test	2024-01-25 23:02:04 +08:00
YuanHuakk	cb2e68cede	Merge pull request 'feat(custom): 新增记录' (#1 ) from dev into test Reviewed-on: #1	2024-01-25 22:54:27 +08:00
YuanHuakk	9f89ccab42	Merge branch 'test'	2023-12-24 00:04:28 +08:00
YuanHuakk	673a17a817	Merge branch 'test'	2023-12-22 22:09:09 +08:00
YuanHuakk	3fa884fbad	Merge branch 'test'	2023-12-20 23:10:53 +08:00
YuanHuakk	c733fc1124	Merge branch 'test'	2023-12-19 23:02:13 +08:00
YuanHuakk	d15a377710	Merge branch 'test'	2023-12-17 00:46:54 +08:00
YuanHuakk	2c13d9d25d	Merge branch 'test'	2023-12-15 20:50:42 +08:00
YuanHuakk	1338ad99ad	Merge branch 'test'	2023-12-13 20:47:00 +08:00
YuanHuakk	9416fced28	Merge branch 'test'	2023-12-08 20:48:41 +08:00
YuanHuakk	92b6c6bea2	Merge branch 'test'	2023-12-04 18:44:43 +08:00
YuanHuakk	23dca69b2f	Merge branch 'test'	2023-11-29 18:54:26 +08:00
YuanHuakk	d8c9c15442	Merge branch 'test'	2023-11-29 15:33:51 +08:00
YuanHuakk	bcf6fa4df2	build(custom): 增加idea配置	2023-10-28 20:19:47 +08:00