Merge remote-tracking branch 'origin/master'

cuilei

17 小时以前 8d0b466ef4fe497932e15c186688679e55a26f62

 src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.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)