Merge remote-tracking branch 'origin/master'

Lius

2023-10-30 ff9dc3f8220dfeb9acddd2f86c28718001e70314

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java

@@ -80,6 +80,7 @@
     */
    @Excel(name = "检定结果", width = 15)
    @ApiModelProperty(value = "检定结果")
    @Dict(dicCode = "technology_status")
    private String calibrationResult;
    /**
     * 检定结果描述