Merge branch 'develop' into release/release_2.12

This commit is contained in:
胡尧
2025-04-28 08:57:10 +08:00

View File

@@ -134,7 +134,7 @@ class PrintingUtils(models.AbstractModel):
# 注册中文字体 # 注册中文字体
font_paths = [ font_paths = [
"/usr/share/fonts/windows/simsun.ttc", # Windows系统宋体 "/usr/share/fonts/chinese/simsun.ttc", # Windows系统宋体
"c:/windows/fonts/simsun.ttc", # Windows系统宋体另一个位置 "c:/windows/fonts/simsun.ttc", # Windows系统宋体另一个位置
"/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf", # Linux Droid字体 "/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf", # Linux Droid字体
"/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc", # 文泉驿正黑 "/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc", # 文泉驿正黑
@@ -217,4 +217,5 @@ class PrintingUtils(models.AbstractModel):
if os.path.exists(qr_temp_path): if os.path.exists(qr_temp_path):
os.remove(qr_temp_path) os.remove(qr_temp_path)
if os.path.exists(output_temp_path): if os.path.exists(output_temp_path):
os.remove(output_temp_path)
os.remove(output_temp_path) os.remove(output_temp_path)