Merge branch 'PureCode' of http://x-copper.cn:8418/WolfSpirit/EJM_Display into PureCode

2025-10-20 22:29:29 +08:00
parent 7d148d79c9 f88b815723
commit ec14de02e7
17 changed files with 451 additions and 1 deletions
--- a/EJM_JueMao.pro.user
+++ b/EJM_JueMao.pro.user
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
+<<<<<<< HEAD
 <!-- Written by QtCreator 4.11.1, 2025-10-19T08:58:24. -->
+=======
+<!-- Written by QtCreator 4.11.1, 2025-10-15T07:56:27. -->
+>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
 <qtcreator>
 <data>
  <variable>EnvironmentId</variable>