Merge branch 'feature/mzl_dev' into develop

# Conflicts:
#	app/admin/service/SysDictService.php
This commit is contained in:
mzl
2025-09-09 13:47:04 +08:00
parent 2cd613eea6
commit f5e93f2400
23 changed files with 1929 additions and 1427 deletions
@@ -244,10 +244,10 @@
<div style="padding-top: 6mm; padding-bottom: 6mm; display: table; margin: 0 0 0 auto;">
<div style="display: table-cell; vertical-align: middle;">
<span>下单人:</span>
<img src="https://mzl.dev.hnxinyouhe.com/01.jpg" style="width: 21mm; height: 12mm; vertical-align: middle;">
<img src="<?php echo htmlspecialchars($data['sign_img_url'] ?? ' - '); ?>" style="width: 21mm; height: 12mm; vertical-align: middle;">
</div>
</div>
<div>下单时间:2025-09-08</div>
<div>下单时间:<?php echo htmlspecialchars($data['created_at'] ?? ' - '); ?></div>
</div>
</div>