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

xuhy

2023-06-14 831e3312572cf29dd91cbd882ef3dce809ac852d

 management/guns-admin/src/main/webapp/static/modular/system/tOrder/tOrder_info.js

@@ -41,6 +41,13 @@
}

/**
 * 关闭此对话框
 */
TOrderInfoDlg.closeException = function() {
    parent.layer.close(window.parent.TOrderException.layerIndex);
}

/**
 * 收集数据
 */
TOrderInfoDlg.collectData = function() {