Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

6 months ago · e94abaf501
parent 01472a7722 0a6bccedf5
commit e94abaf501
194 changed files with 14430 additions and 106 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,4 +5,5 @@ QingLongJava.iml
 /ETL/Data/
 /lib/*.jar
 /WEB-INF/
-/target
+/target
+./YunXiaoTools/target/
--- a/WebRoot/Excel/0063a47c-5cc8-4a79-beee-00d3d7abe8eb.pdf
+++ b/WebRoot/Excel/0063a47c-5cc8-4a79-beee-00d3d7abe8eb.pdf
--- a/WebRoot/Excel/0063a47c-5cc8-4a79-beee-00d3d7abe8eb.xlsx
+++ b/WebRoot/Excel/0063a47c-5cc8-4a79-beee-00d3d7abe8eb.xlsx
--- a/WebRoot/Excel/0c81268b-fc39-4fa2-ba9d-b99a7f0774c8.pdf
+++ b/WebRoot/Excel/0c81268b-fc39-4fa2-ba9d-b99a7f0774c8.pdf
--- a/WebRoot/Excel/0c81268b-fc39-4fa2-ba9d-b99a7f0774c8.xlsx
+++ b/WebRoot/Excel/0c81268b-fc39-4fa2-ba9d-b99a7f0774c8.xlsx
--- a/WebRoot/Excel/0d63b7e8-f3f3-4117-9c46-4c765a3bd893.xlsx
+++ b/WebRoot/Excel/0d63b7e8-f3f3-4117-9c46-4c765a3bd893.xlsx
--- a/WebRoot/Excel/20f0c531-6c0e-4109-b40c-5cd05a36269b.pdf
+++ b/WebRoot/Excel/20f0c531-6c0e-4109-b40c-5cd05a36269b.pdf
--- a/WebRoot/Excel/20f0c531-6c0e-4109-b40c-5cd05a36269b.xlsx
+++ b/WebRoot/Excel/20f0c531-6c0e-4109-b40c-5cd05a36269b.xlsx
--- a/WebRoot/Excel/339d2d29-f874-4e8d-9ef4-9cf8c0849eaa.pdf
+++ b/WebRoot/Excel/339d2d29-f874-4e8d-9ef4-9cf8c0849eaa.pdf
--- a/WebRoot/Excel/339d2d29-f874-4e8d-9ef4-9cf8c0849eaa.xlsx
+++ b/WebRoot/Excel/339d2d29-f874-4e8d-9ef4-9cf8c0849eaa.xlsx
--- a/WebRoot/Excel/493688ee-5867-40a7-9477-a3f951dca119.pdf
+++ b/WebRoot/Excel/493688ee-5867-40a7-9477-a3f951dca119.pdf
--- a/WebRoot/Excel/493688ee-5867-40a7-9477-a3f951dca119.xlsx
+++ b/WebRoot/Excel/493688ee-5867-40a7-9477-a3f951dca119.xlsx
--- a/WebRoot/Excel/4efd6d13-f568-442b-bec5-8f09f9b4e5b0.xlsx
+++ b/WebRoot/Excel/4efd6d13-f568-442b-bec5-8f09f9b4e5b0.xlsx
--- a/WebRoot/Excel/51c0e795-5e84-4604-a970-1d171ff61dac.pdf
+++ b/WebRoot/Excel/51c0e795-5e84-4604-a970-1d171ff61dac.pdf
--- a/WebRoot/Excel/51c0e795-5e84-4604-a970-1d171ff61dac.xlsx
+++ b/WebRoot/Excel/51c0e795-5e84-4604-a970-1d171ff61dac.xlsx
--- a/WebRoot/Excel/66e95231-80b2-4d33-aada-b280116db48a.xlsx
+++ b/WebRoot/Excel/66e95231-80b2-4d33-aada-b280116db48a.xlsx
--- a/WebRoot/Excel/6fcc3ea2-0e03-4323-a91f-fac8367f4937.pdf
+++ b/WebRoot/Excel/6fcc3ea2-0e03-4323-a91f-fac8367f4937.pdf
--- a/WebRoot/Excel/6fcc3ea2-0e03-4323-a91f-fac8367f4937.xlsx
+++ b/WebRoot/Excel/6fcc3ea2-0e03-4323-a91f-fac8367f4937.xlsx
--- a/WebRoot/Excel/713af39f-20e8-4ddb-9954-f188c2a2624a.xlsx
+++ b/WebRoot/Excel/713af39f-20e8-4ddb-9954-f188c2a2624a.xlsx
--- a/WebRoot/Excel/7580aba1-50df-4774-9e95-994501ffe12d.pdf
+++ b/WebRoot/Excel/7580aba1-50df-4774-9e95-994501ffe12d.pdf
--- a/WebRoot/Excel/7580aba1-50df-4774-9e95-994501ffe12d.xlsx
+++ b/WebRoot/Excel/7580aba1-50df-4774-9e95-994501ffe12d.xlsx
--- a/WebRoot/Excel/785fef9b-530b-482d-81b4-f0ded2e3ae51.xlsx
+++ b/WebRoot/Excel/785fef9b-530b-482d-81b4-f0ded2e3ae51.xlsx
--- a/WebRoot/Excel/8b52718c-e151-42e0-8a59-3b8ad2ed59f3.xlsx
+++ b/WebRoot/Excel/8b52718c-e151-42e0-8a59-3b8ad2ed59f3.xlsx
--- a/WebRoot/Excel/954164e6-2841-4d91-9843-9454838b54c2.pdf
+++ b/WebRoot/Excel/954164e6-2841-4d91-9843-9454838b54c2.pdf
--- a/WebRoot/Excel/954164e6-2841-4d91-9843-9454838b54c2.xlsx
+++ b/WebRoot/Excel/954164e6-2841-4d91-9843-9454838b54c2.xlsx
--- a/WebRoot/Excel/c4e55c78-9592-40ea-9d2e-27c68d95149a.pdf
+++ b/WebRoot/Excel/c4e55c78-9592-40ea-9d2e-27c68d95149a.pdf
--- a/WebRoot/Excel/c4e55c78-9592-40ea-9d2e-27c68d95149a.xlsx
+++ b/WebRoot/Excel/c4e55c78-9592-40ea-9d2e-27c68d95149a.xlsx
--- a/WebRoot/Excel/c887fee0-2c56-4cd1-88e2-7ee78ad3adda.xlsx
+++ b/WebRoot/Excel/c887fee0-2c56-4cd1-88e2-7ee78ad3adda.xlsx
--- a/WebRoot/Excel/d34d8ef4-5292-460d-9e82-d34cc43d4912.xlsx
+++ b/WebRoot/Excel/d34d8ef4-5292-460d-9e82-d34cc43d4912.xlsx
--- a/WebRoot/Excel/daa361a2-5986-4fc2-b2c0-f84da44e0c45.xlsx
+++ b/WebRoot/Excel/daa361a2-5986-4fc2-b2c0-f84da44e0c45.xlsx
--- a/WebRoot/Excel/eb689cf6-21d5-4041-9d42-fc82cc271519.pdf
+++ b/WebRoot/Excel/eb689cf6-21d5-4041-9d42-fc82cc271519.pdf
--- a/WebRoot/Excel/eb689cf6-21d5-4041-9d42-fc82cc271519.xlsx
+++ b/WebRoot/Excel/eb689cf6-21d5-4041-9d42-fc82cc271519.xlsx
--- a/WebRoot/Excel/edaf4c77-2cf6-446c-b668-1ba5c8ca54e8.pdf
+++ b/WebRoot/Excel/edaf4c77-2cf6-446c-b668-1ba5c8ca54e8.pdf
--- a/WebRoot/Excel/edaf4c77-2cf6-446c-b668-1ba5c8ca54e8.xlsx
+++ b/WebRoot/Excel/edaf4c77-2cf6-446c-b668-1ba5c8ca54e8.xlsx
--- a/WebRoot/csv/excel_义务教育在校生总量_2a7d8ec9ec.csv
+++ b/WebRoot/csv/excel_义务教育在校生总量_2a7d8ec9ec.csv
--- a/WebRoot/csv/excel_学前幼儿入园总量_86df0e5a25.csv
+++ b/WebRoot/csv/excel_学前幼儿入园总量_86df0e5a25.csv
--- a/WebRoot/upload/03E8867B-7915-4663-9567-59EF12A01556.doc
+++ b/WebRoot/upload/03E8867B-7915-4663-9567-59EF12A01556.doc
--- a/WebRoot/upload/06066597-5B73-40FE-B49E-A72D2017614A.doc
+++ b/WebRoot/upload/06066597-5B73-40FE-B49E-A72D2017614A.doc
--- a/WebRoot/upload/0845EB7F-3D65-4A3E-B229-6C18C4BFBB0D.doc
+++ b/WebRoot/upload/0845EB7F-3D65-4A3E-B229-6C18C4BFBB0D.doc
--- a/WebRoot/upload/13CAFA9F-C6DF-485B-B5FB-5C2B7BD7EB91.xlsx
+++ b/WebRoot/upload/13CAFA9F-C6DF-485B-B5FB-5C2B7BD7EB91.xlsx
--- a/WebRoot/upload/17CE00C4-2719-4B21-80B1-436B007789F6.docx
+++ b/WebRoot/upload/17CE00C4-2719-4B21-80B1-436B007789F6.docx
--- a/WebRoot/upload/1BE372CC-9751-4D55-A932-C2FBEB77403F.docx
+++ b/WebRoot/upload/1BE372CC-9751-4D55-A932-C2FBEB77403F.docx
--- a/WebRoot/upload/1CEA9293-8301-4C95-9CDC-4318AE9330BA.doc
+++ b/WebRoot/upload/1CEA9293-8301-4C95-9CDC-4318AE9330BA.doc
--- a/WebRoot/upload/1EB11ABB-4AD2-4994-991D-50AE28F3A4A1.xlsx
+++ b/WebRoot/upload/1EB11ABB-4AD2-4994-991D-50AE28F3A4A1.xlsx
--- a/WebRoot/upload/25186A8E-902D-4F2D-BF6B-23F5275B5AF5.xlsx
+++ b/WebRoot/upload/25186A8E-902D-4F2D-BF6B-23F5275B5AF5.xlsx
--- a/WebRoot/upload/255E1C19-965F-4DC1-AA29-A876F7CEBE45.xlsx
+++ b/WebRoot/upload/255E1C19-965F-4DC1-AA29-A876F7CEBE45.xlsx
--- a/WebRoot/upload/257B8D71-4B52-4857-A98A-B8428E130A2A.docx
+++ b/WebRoot/upload/257B8D71-4B52-4857-A98A-B8428E130A2A.docx
--- a/WebRoot/upload/27C57AB7-6207-4D14-8366-44BEED2CBB02.pdf
+++ b/WebRoot/upload/27C57AB7-6207-4D14-8366-44BEED2CBB02.pdf
--- a/WebRoot/upload/27C57AB7-6207-4D14-8366-44BEED2CBB02.xlsx
+++ b/WebRoot/upload/27C57AB7-6207-4D14-8366-44BEED2CBB02.xlsx
--- a/WebRoot/upload/28FCADA4-98DE-4734-A1F3-633703414202.xlsx
+++ b/WebRoot/upload/28FCADA4-98DE-4734-A1F3-633703414202.xlsx
--- a/WebRoot/upload/2AD8451F-B0D0-4FC4-8BD9-3F23B6077499.docx
+++ b/WebRoot/upload/2AD8451F-B0D0-4FC4-8BD9-3F23B6077499.docx
--- a/WebRoot/upload/2BD1EB67-1400-4DA1-8383-3D4EC3C9EE26.doc
+++ b/WebRoot/upload/2BD1EB67-1400-4DA1-8383-3D4EC3C9EE26.doc
--- a/WebRoot/upload/2D8937B7-A51C-4F1D-BDFB-4C4B05066217.pdf
+++ b/WebRoot/upload/2D8937B7-A51C-4F1D-BDFB-4C4B05066217.pdf
--- a/WebRoot/upload/2D8937B7-A51C-4F1D-BDFB-4C4B05066217.xlsx
+++ b/WebRoot/upload/2D8937B7-A51C-4F1D-BDFB-4C4B05066217.xlsx
--- a/WebRoot/upload/31BA93CE-1233-4DE5-952E-236211A2B4DA.doc
+++ b/WebRoot/upload/31BA93CE-1233-4DE5-952E-236211A2B4DA.doc
--- a/WebRoot/upload/32A96D2C-D534-4E54-AC92-056D108A5680.doc
+++ b/WebRoot/upload/32A96D2C-D534-4E54-AC92-056D108A5680.doc
--- a/WebRoot/upload/346E6029-C025-4234-BE6E-2B59C581074A.xlsx
+++ b/WebRoot/upload/346E6029-C025-4234-BE6E-2B59C581074A.xlsx
--- a/WebRoot/upload/35285116-7FE1-4840-9EF3-5A0682BF3F87.xlsx
+++ b/WebRoot/upload/35285116-7FE1-4840-9EF3-5A0682BF3F87.xlsx
--- a/WebRoot/upload/38E60A82-1B3C-457D-B939-4EB2BDB900D0.docx
+++ b/WebRoot/upload/38E60A82-1B3C-457D-B939-4EB2BDB900D0.docx
--- a/WebRoot/upload/39E11808-F5D0-4819-A77D-7F7BB0989751.doc
+++ b/WebRoot/upload/39E11808-F5D0-4819-A77D-7F7BB0989751.doc
--- a/WebRoot/upload/3E06C2D3-9F8B-4190-852B-A8CA3242330A.xls
+++ b/WebRoot/upload/3E06C2D3-9F8B-4190-852B-A8CA3242330A.xls
--- a/WebRoot/upload/3E76CCD0-CFFC-4505-8E07-8F7B97C8A80B.docx
+++ b/WebRoot/upload/3E76CCD0-CFFC-4505-8E07-8F7B97C8A80B.docx
--- a/WebRoot/upload/405CEA72-F373-477A-B53F-D3816BAB0817.docx
+++ b/WebRoot/upload/405CEA72-F373-477A-B53F-D3816BAB0817.docx
--- a/WebRoot/upload/40B793B7-F949-40EC-910E-08801D5E7961.xls
+++ b/WebRoot/upload/40B793B7-F949-40EC-910E-08801D5E7961.xls
--- a/WebRoot/upload/469EDC47-2738-4928-88E0-C44ACD6E633F.doc
+++ b/WebRoot/upload/469EDC47-2738-4928-88E0-C44ACD6E633F.doc
--- a/WebRoot/upload/4C816E84-6C6F-4D24-9596-0AC3AEA23CF8.xlsx
+++ b/WebRoot/upload/4C816E84-6C6F-4D24-9596-0AC3AEA23CF8.xlsx
--- a/WebRoot/upload/557C980E-37D5-4B52-A2C4-3F1E01B27809.png
+++ b/WebRoot/upload/557C980E-37D5-4B52-A2C4-3F1E01B27809.png
--- a/WebRoot/upload/5A705474-8045-4862-94AB-A1AF2DACF66E.doc
+++ b/WebRoot/upload/5A705474-8045-4862-94AB-A1AF2DACF66E.doc
--- a/WebRoot/upload/5BD6A20E-8034-4567-BB45-0BD0902D374F.doc
+++ b/WebRoot/upload/5BD6A20E-8034-4567-BB45-0BD0902D374F.doc
--- a/WebRoot/upload/5D405DEE-A894-4599-B47E-42FB97C437E3.xlsx
+++ b/WebRoot/upload/5D405DEE-A894-4599-B47E-42FB97C437E3.xlsx
--- a/WebRoot/upload/65040C7D-FDD1-40F3-B85E-B2EFD68C1D14.xlsx
+++ b/WebRoot/upload/65040C7D-FDD1-40F3-B85E-B2EFD68C1D14.xlsx
--- a/WebRoot/upload/6C6C5420-E160-44DE-A211-BD86F30F330F.docx
+++ b/WebRoot/upload/6C6C5420-E160-44DE-A211-BD86F30F330F.docx
--- a/WebRoot/upload/72563146-ED1C-4F51-ACC1-E5B5B3225E55.xlsx
+++ b/WebRoot/upload/72563146-ED1C-4F51-ACC1-E5B5B3225E55.xlsx
--- a/WebRoot/upload/85D26ABD-6FD2-4C4D-95CD-D4A7993A8D41.xlsx
+++ b/WebRoot/upload/85D26ABD-6FD2-4C4D-95CD-D4A7993A8D41.xlsx
--- a/WebRoot/upload/8621A207-1DAD-4CD2-A53E-7709D26CEAC4.doc
+++ b/WebRoot/upload/8621A207-1DAD-4CD2-A53E-7709D26CEAC4.doc
--- a/WebRoot/upload/86C33C2F-BB08-4D33-AD00-18F80F400B4A.xlsx
+++ b/WebRoot/upload/86C33C2F-BB08-4D33-AD00-18F80F400B4A.xlsx
--- a/WebRoot/upload/879FB621-7042-4755-B0C1-38E6015C5AD2.xls
+++ b/WebRoot/upload/879FB621-7042-4755-B0C1-38E6015C5AD2.xls
--- a/WebRoot/upload/87B7C257-2665-4130-ABD3-92912CB91B61.xlsx
+++ b/WebRoot/upload/87B7C257-2665-4130-ABD3-92912CB91B61.xlsx
@ -1,2 +0,0 @@
-教师姓名,性别,登录名,初始密码
-"李局长","男","cxljz","123456"
--- a/WebRoot/upload/89D8B560-3447-4DDA-8318-F8013B143D4E.png
+++ b/WebRoot/upload/89D8B560-3447-4DDA-8318-F8013B143D4E.png
--- a/WebRoot/upload/8C19A65A-0D62-4E24-A757-F96DD9B8BB8B.docx
+++ b/WebRoot/upload/8C19A65A-0D62-4E24-A757-F96DD9B8BB8B.docx
--- a/WebRoot/upload/900F4FDF-753C-449B-85FC-14124845538A.docx
+++ b/WebRoot/upload/900F4FDF-753C-449B-85FC-14124845538A.docx
--- a/WebRoot/upload/95EAB5DF-A2F1-4C31-AB90-B3918E60A4AB.docx
+++ b/WebRoot/upload/95EAB5DF-A2F1-4C31-AB90-B3918E60A4AB.docx
--- a/WebRoot/upload/96F840D8-E7FB-4D58-A735-DE951A103180.xlsx
+++ b/WebRoot/upload/96F840D8-E7FB-4D58-A735-DE951A103180.xlsx
--- a/WebRoot/upload/98528CE7-8AA4-4614-9C65-A4F9BFE535D3.docx
+++ b/WebRoot/upload/98528CE7-8AA4-4614-9C65-A4F9BFE535D3.docx
--- a/WebRoot/upload/998F48E6-70C3-42B6-85F6-497989C85E73.xls
+++ b/WebRoot/upload/998F48E6-70C3-42B6-85F6-497989C85E73.xls
--- a/WebRoot/upload/9A5DBAB3-6EBC-42A6-8C32-A722A5BC6124.xlsx
+++ b/WebRoot/upload/9A5DBAB3-6EBC-42A6-8C32-A722A5BC6124.xlsx
--- a/WebRoot/upload/A4434EFC-2FA8-46F3-B89C-C2AED16F14D7.doc
+++ b/WebRoot/upload/A4434EFC-2FA8-46F3-B89C-C2AED16F14D7.doc
--- a/WebRoot/upload/B1CED318-4295-43F8-AF34-9722ACB2BAFF.doc
+++ b/WebRoot/upload/B1CED318-4295-43F8-AF34-9722ACB2BAFF.doc
--- a/WebRoot/upload/B3A75250-C5E2-4278-8BB3-7C8BD2DD2C73.docx
+++ b/WebRoot/upload/B3A75250-C5E2-4278-8BB3-7C8BD2DD2C73.docx
--- a/WebRoot/upload/B6770DB3-F2F6-4B4B-9B6F-B8CA6AD5BFF0.doc
+++ b/WebRoot/upload/B6770DB3-F2F6-4B4B-9B6F-B8CA6AD5BFF0.doc
--- a/WebRoot/upload/B7DCABAD-14C6-43DA-AF6D-134E1D6459FA.xlsx
+++ b/WebRoot/upload/B7DCABAD-14C6-43DA-AF6D-134E1D6459FA.xlsx
--- a/WebRoot/upload/BD877F08-C14D-47EA-AB63-0EB9BDE875C2.doc
+++ b/WebRoot/upload/BD877F08-C14D-47EA-AB63-0EB9BDE875C2.doc
--- a/WebRoot/upload/C081A3E7-7CB1-40D0-8274-C9E835F111DE.doc
+++ b/WebRoot/upload/C081A3E7-7CB1-40D0-8274-C9E835F111DE.doc
--- a/WebRoot/upload/C89390A6-FB33-4413-9B86-3E399F4987D4.xlsx
+++ b/WebRoot/upload/C89390A6-FB33-4413-9B86-3E399F4987D4.xlsx
--- a/WebRoot/upload/CB56F2C4-8DBB-41F2-AA2D-90959334A336.xlsx
+++ b/WebRoot/upload/CB56F2C4-8DBB-41F2-AA2D-90959334A336.xlsx
--- a/WebRoot/upload/CE5DC3B4-7C85-4D6A-8769-86E2235119C1.docx
+++ b/WebRoot/upload/CE5DC3B4-7C85-4D6A-8769-86E2235119C1.docx
--- a/WebRoot/upload/D03A09D7-B215-4F3C-9628-000DAB8EFF70.doc
+++ b/WebRoot/upload/D03A09D7-B215-4F3C-9628-000DAB8EFF70.doc
--- a/WebRoot/upload/D0D958A2-1C08-436D-B446-6D39481B2A16.xlsx
+++ b/WebRoot/upload/D0D958A2-1C08-436D-B446-6D39481B2A16.xlsx
--- a/WebRoot/upload/D2F59289-FDCB-4483-85BB-C50E05CEE40A.doc
+++ b/WebRoot/upload/D2F59289-FDCB-4483-85BB-C50E05CEE40A.doc
--- a/WebRoot/upload/D6909D7C-974D-4EB1-9CD3-55AB4A394C78.doc
+++ b/WebRoot/upload/D6909D7C-974D-4EB1-9CD3-55AB4A394C78.doc
--- a/Show More
+++ b/Show More