Merge remote-tracking branch 'origin/master'

cuilei

17 小时以前 8d0b466ef4fe497932e15c186688679e55a26f62

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

@@ -48,7 +48,7 @@
    @ApiModelProperty(value = "入库单")
    private String orderId;
   /**刀具ID*/
   @Excel(name = "刀具ID", width = 15)
   @Excel(name = "刀具ID", width = 15,dictTable = "cms_cutting_tool",dicCode = "id",dicText = "cutting_code")
    @ApiModelProperty(value = "刀具ID")
    private String cuttingId;
   /**入库数量*/