Merge remote-tracking branch 'origin/master'

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/entity/ItdmGongdanDetail.java

@@ -48,7 +48,7 @@ public class ItdmGongdanDetail implements Serializable {
     private java.lang.String shijiShebeiId;
 	/**实绩试验类型*/
 	@Excel(name = "实绩试验类型", width = 15, dicCode = "shiyan_type")
-	@Dict(dicCode = "shiyan_type")
+	@Dict(dicCode = "shiiyan_type")
     @ApiModelProperty(value = "实绩试验类型")
     private java.lang.String shijiShiiyanType;
 	/**任务日期*/