Merge remote-tracking branch 'origin/qr_branch' into qr_branch

2025-11-26 10:22:15 +08:00
parent 6596a572d6 786bd5d660
commit 41c557118c
21 changed files with 63 additions and 30 deletions
--- a/entrance/src/main/resources/application.yml
+++ b/entrance/src/main/resources/application.yml
@@ -87,7 +87,7 @@ log:
 report:
  template: D:\template
  reportDir: D:\report
-
+  dateFormat: yyyy年MM月dd日
 qr:
  cloud: http://pqmcc.com:18082/api/file
  dev:
--- a/entrance/src/main/resources/model/NPQS680.docx
+++ b/entrance/src/main/resources/model/NPQS680.docx
--- a/entrance/src/main/resources/model/PQ-COM.docx
+++ b/entrance/src/main/resources/model/PQ-COM.docx
--- a/entrance/src/main/resources/model/PQV-700.docx
+++ b/entrance/src/main/resources/model/PQV-700.docx
--- a/entrance/src/main/resources/model/njcn_882.docx
+++ b/entrance/src/main/resources/model/njcn_882.docx
--- a/entrance/src/main/resources/model/njcn_882A.docx
+++ b/entrance/src/main/resources/model/njcn_882A.docx
--- a/entrance/src/main/resources/model/njcn_882B1.docx
+++ b/entrance/src/main/resources/model/njcn_882B1.docx
--- a/entrance/src/main/resources/model/njcn_882B2.docx
+++ b/entrance/src/main/resources/model/njcn_882B2.docx
--- a/entrance/src/main/resources/model/njcn_882B3.docx
+++ b/entrance/src/main/resources/model/njcn_882B3.docx
--- a/entrance/src/main/resources/model/njcn_882B4.docx
+++ b/entrance/src/main/resources/model/njcn_882B4.docx
--- a/entrance/src/main/resources/model/njcn_882B5.docx
+++ b/entrance/src/main/resources/model/njcn_882B5.docx
--- a/entrance/src/main/resources/model/njcn_882B6.docx
+++ b/entrance/src/main/resources/model/njcn_882B6.docx
--- a/entrance/src/main/resources/model/report_table
+++ b/entrance/src/main/resources/model/report_table
--- a/entrance/src/main/resources/model/report_table.docx
+++ b/entrance/src/main/resources/model/report_table.docx