Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2023-11-13 ffe9c08011d25c39880d107a5f3de249d309c1b4

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml

@@ -81,6 +81,7 @@
            t1.photo,
            t1.inspection_project_id as inspectionProjectId,
            t3.num as inspectionProjectNum,
            t3.name as inspectionProjectName,
            t3.detection_standard as detectionStandard,
            t3.acceptability_limit AS acceptabilityLimit,
            t3.inspection_method as inspectionMethod,
@@ -111,6 +112,7 @@
            t1.photo,
            t1.inspection_project_id AS inspectionProjectId,
            t3.num AS inspectionProjectNum,
            t3.name as inspectionProjectName,
            t3.detection_standard AS detectionStandard,
            t3.acceptability_limit AS acceptabilityLimit,
            t3.inspection_method AS inspectionMethod,