diff --git a/ArcFace64.dat b/ArcFace64.dat
index 898f484e2..e04abe452 100644
--- a/ArcFace64.dat
+++ b/ArcFace64.dat
@@ -1 +1 @@
-EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGEDVIQGKEJIKACHIIXDEELIWCCEEELCVCEHFHAJGIPGIIKJRASJFEHAMIKCIGXAPGEHIIZGFBBJMFJJNGFHUGDGDFGFAITGDAXBGAZGKAMBMDABKBAERDUHDAUDOEBIBGBBMCUIZGABKCABIDMFHFRILIIANEBEWBOAIJHBYFAIREBFQFFCHHREKFTFJJQIAGFDSDZHMHUCGBVHIAUENBCJIBBJDIHHDIQFKFNDEBJCKCFGLJKBMHFAZHTHOIRGLJFDUHWEVFGFHDKIBEKFVCGAQJGCYBZAMHDJBJREAIOJPIAJDCJFXHKHPJTHUBTJPDWISESIEIPISDWDRAMFVFFBJCTFVFAARGJHFIMELIQJEAHFRFQDTERDCCGDCIKCAGBJVDLGHEXEBAWAMAFITJDANGBCRDPBPEECBAVAEAYJVHCBNCPHOFUJNGGJFFREZFAAKGEGQCQHDBZBWENDKCGHTFXCXAIEHGWEPFOGYFIFSHOCRJCBOHDDLDCCAJGBGAPCXDMHMAYAHBFHNCYJTEHENIJEBDNBPFLBDBUGADIGTEWEAHEEGHGJBDXEEJMBLAKHYJHBPEKBEHHHQDECQEMGEFRCIHLIVGXBXFQBTJECKEPCSDRGPFLAZADHCENEJCQJIHPDNJTCBDXCCAFEFGIJNEBBIHSFFFMEEDADRCHFKEXHNEIAFHAAGHAJQCTGDGVFOIYBRJEJVEUJJDOEIJCIQBMCUASHBIVHNDADKALISDXFADZICEJCPASDRGSERDWHXIGAYBJFVELGJGXEHDQJTHYBXHVHNIAIWIOIJGRCBAXAIIHFJGGAHGDAPAHCHHHJHETHBBDIUJOJBCVIMJLEKDJIUBDHHBRAEGMEBBUHKHKCABLHQARARFTFRCZGTEGANJTBGJTFTCJGXHDHXEHEGBMGDABADDCAFABHKFRAWDQJAEFCNGMCTBWADCGCUACALIAHFDEAEJUESGFCTFAHZFOFKHSILFFIHJLAWHEFMFJFKBODTCDJGEPBXHQHYBSHWBADOJCIAHLJJCUBYFLHPDMJTJGJVFZEEDKIMGJHUBTJDATAKFICECEBMHBIKJQCTFDEZFBAHJNFLJGIKAJCGDOIHJSEE
\ No newline at end of file
+EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGEDVIQGKEJIKACHIIXDEELIWCCEEELCVCEHFHAJGIPGIIKJRASJFEHAMIKCIGXAPGEHIIZGFBBJMFJJNGFHUGDGDFGFAITGDAXBGAZGKAMBMDABKBAERDUHDAUDOEBIBGBBMCUIZGABKCABIDMFHFRILIIANEBEWBOAIJHBYFAIREBFQFFCHHREKFTFJJQIAGFDSDZHMHUCGBVHIAUENBCJIBBJDIHHDIQFKFNDEBJCKCFGLJKBMHFAZHTHOIRGLJFDUHWEVFGFHDKIBEKFVCGAQJGCYBZAMHDJBJREAIOJPIAJDCJFXHKHPJTHUBTJPDWISESIEIPISDWDRAMFVFFBJCTFVFAARGJHFIMELIQJEAHFRFQDTERDCCGDCIKCAGBJVDLGHEXEBAWAMAFITJDANGBCRDPBPEECBAVAEBBBYBUERFXCYIOHWAOHQBVDFJGCEFZFHAUJGJNJGAPDRJMESBAFHGACOCDDHCOCCEXDDDVDRAVDEHOGBBRANCXEJFVBIABDLDOAVCQBICYCDIBAXJRBQGVDFHQAKDYEDHRHVAGGUJHIAHSFIFUCIDCBRHZDOASDAIDHCJNDEJCFDHIBCFLCQBYFWGNFKAIJQFKFBAPEBGMDOBXGGCAIUENJHDRATFCHIGBCCGZBDJLHQFSHDINHJEVIJESEWANJFEQIVBAILJLBACPHNCHEMAYHJGBAOHLCTGAGLFWBQHFFPEKBYHDEUAOBAABJSBNFFINFDAAGUJTAVBVDHDTEEFNBSJKJNCODGHEECIRGXARCCFZFBFMDJCDGREDCNFOAWEPFIFCGWEBBZHPFVHDBUHFCHFDACJCGSARHMCMBMDDCRCWHBAZJBHHJMDKFWBKFQIHAFADBLGFCSJBEWFAJLGVGPBNANFPINAHIRIJEYJRFWDPCDCSBEGHHTGMATCWEYGQHGAHEJIEHQDZEHCRIRGLJHDABFJKDKBPGUJFJICIGVHRIZHXDWADHMDTABAXCGJIBLHIBYDJELBYBJIFJNDCCICIJDELBOJBJEBRFZDCBUHXGDBKCVBGGQHUFUJIIYHFAAIBBDCEAYDLFHBDBJCADMDFCDGMAYHLHDBGDSCHCECOEAEYJOIFHZ
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cb11c3673..46bee0c68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -725,7 +725,7 @@
         <dependency>
             <groupId>net.sf.mpxj</groupId>
             <artifactId>mpxj</artifactId>
-            <version>8.3.3</version>
+            <version>10.11.0</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml
index c24f130e1..434e65060 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml
@@ -11,7 +11,7 @@
         </if>
         <if test="param.startTime!=null and param.startTime!=''">
             AND a.start_time &gt;=CONCAT(DATE_FORMAT(#{param.startTime},'%Y-%m-%d'),' 00:00:00')
-        </if>z
+        </if>
         <if test="param.endTime!=null and param.endTime!=''">
             AND a.end_time &lt;=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59')
         </if>
diff --git a/src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricalDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricalDataMapper.xml
index 811277df0..ddc4516a5 100644
--- a/src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricalDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/electrical/mapper/xml/ElectricalDataMapper.xml
@@ -34,6 +34,6 @@
         <if test="param.endTime!=null and param.endTime!=''">
             and a.upload_time &lt;=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59')
         </if>
-
+        ORDER BY a.upload_time DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ce8999453..92160369c 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 # \u73AF\u5883\u9009\u62E9
-spring.profiles.active=dev
+spring.profiles.active=zjsj
 #spring.profiles.active=dev6024
 #spring.profiles.active=dev6025
 #spring.profiles.active=hncs
diff --git a/src/main/resources/dll/libarcsoft_face.dll b/src/main/resources/dll/libarcsoft_face.dll
index 09cddbb13..e69de29bb 100644
Binary files a/src/main/resources/dll/libarcsoft_face.dll and b/src/main/resources/dll/libarcsoft_face.dll differ
diff --git a/src/main/resources/dll/libarcsoft_face_engine.dll b/src/main/resources/dll/libarcsoft_face_engine.dll
index 172a0dffa..e69de29bb 100644
Binary files a/src/main/resources/dll/libarcsoft_face_engine.dll and b/src/main/resources/dll/libarcsoft_face_engine.dll differ
diff --git a/src/main/resources/dll/libarcsoft_face_engine_jni.dll b/src/main/resources/dll/libarcsoft_face_engine_jni.dll
index d3f02d98e..e69de29bb 100644
Binary files a/src/main/resources/dll/libarcsoft_face_engine_jni.dll and b/src/main/resources/dll/libarcsoft_face_engine_jni.dll differ