Merge branch 'yyk'

yuyou_x

2024-02-05 b79c300768db0aa78723c0b7f5a6a4d6d4c94bc9

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -1187,7 +1187,7 @@
                  layer.open({
                     type: 2,
                     title: '生成标签',
                     content: 'LabelPrintSelect.html',
                     content: 'LabelPrintSelect.html?Id='+id,
                     maxmin: true,
                     area: ['480px', '615px'],
                     btn: ['确定','取消'],