diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java index 815af691..0a489887 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java @@ -73,14 +73,14 @@ public class BusMaterialsInventoryVo implements Serializable { * 剩余库存数量(记录最后一次操作留下的库存数) */ @ExcelProperty(value = "剩余库存数量", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "记=录最后一次操作留下的库存数") + @ExcelDictFormat(readConverterExp = "记录最后一次操作留下的库存数") private Long residue; /** * 操作人(入库人、领料人) */ @ExcelProperty(value = "操作人", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "入=库人、领料人") + @ExcelDictFormat(readConverterExp = "入库人、领料人") private String operator; /** diff --git a/plus-ui/src/api/machinery/machinery/types.ts b/plus-ui/src/api/machinery/machinery/types.ts index ed6e92c1..113b354a 100644 --- a/plus-ui/src/api/machinery/machinery/types.ts +++ b/plus-ui/src/api/machinery/machinery/types.ts @@ -100,7 +100,7 @@ export interface MachineryQuery extends PageRequest { /** * 备注 - */1 + */ remark?: string; /**