Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 2a96427d46697e1d99e5ad78b3ac441f999dd600

 src/main/java/org/jeecg/modules/cms/entity/RatedLife.java

@@ -55,6 +55,7 @@
   /**刀具ID*/
   @Excel(name = "刀具ID", width = 15)
    @ApiModelProperty(value = "刀具ID")
    @Dict(dictTable = "cms_cutting_tool",dicCode = "id",dicText = "cutting_code")
    private String cuttingId;
   /**工件材质*/
   @Excel(name = "工件材质", width = 15)