Merge remote-tracking branch 'origin/main'

yudao-module-common/yudao-module-common-biz/src/main/resources/mapper/mold/MoldMapper.xml

@@ -13,5 +13,7 @@
         from mes_print_template
         where deleted = 0
         and template_type = 4
+        and template_biz_type = 1
+
     </select>
 </mapper>

yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/product/ErpProductMapper.xml

@@ -53,6 +53,7 @@
         from mes_print_template
         where deleted = 0
         and template_type = #{templateType}
+        and template_biz_type = 1
     </select>
 
 

yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/criticalcomponent/CriticalComponentMapper.xml

@@ -14,6 +14,8 @@
         from mes_print_template
         where deleted = 0
         and template_type = 3
+        and template_biz_type = 1
+
     </select>
 
 </mapper>

yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/deviceledger/DeviceledgerMapper.xml

@@ -32,5 +32,7 @@
         from mes_print_template
         where deleted = 0
         and template_type = 2
+        and template_biz_type = 1
+
     </select>
 </mapper>

yudao-server/src/main/resources/application.yaml

@@ -40,15 +40,15 @@ server:
 
 springdoc:
   api-docs:
-    enabled: true
+    enabled: false
     path: /v3/api-docs
   swagger-ui:
-    enabled: true
+    enabled: false
     path: /swagger-ui
   default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档
 
 knife4j:
-  enable: true
+  enable: false
   setting:
     language: zh_cn