Merge remote-tracking branch 'origin/master'

Lius

7 天以前 7d2ae4c2fd8d45f0896b9accf84ff4177638fbcd

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

@@ -86,4 +86,6 @@
   private String equipmentName;
   @TableField(exist = false)
   private String equipmentModel;
   @TableField(exist = false)
   private String keyword;
}