From 6010ca75d72de97c9373b80f78c11dae90c187ba Mon Sep 17 00:00:00 2001 From: lenovo <123> Date: Wed, 4 Jan 2023 18:58:17 +0800 Subject: [PATCH] =?UTF-8?q?2023-1-4=E4=BA=A7=E5=93=81=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/product/pdmachine/entity/ProductMachine.java | 2 +- .../modules/product/pdmachine/mapper/ProductMachineMapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java index 05e7ec14..34911d5e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java @@ -49,7 +49,7 @@ public class ProductMachine implements Serializable { /**设备d*/ @Excel(name = "设备d", width = 15) @ApiModelProperty(value = "设备d") - @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") + @Dict(dictTable = "zy_device", dicText = "name", dicCode = "id") private String machineId; /**序号*/ @Excel(name = "序号", width = 15) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java index 9584a5b0..238dbf64 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java @@ -18,7 +18,7 @@ import org.jeecg.modules.product.pdmachine.entity.ProductMachine; */ public interface ProductMachineMapper extends BaseMapper { - @Select("select id from zy_devicetype where name like #{s}") + @Select("select id from zy_device where name like #{s}") List find(String s); @Update("update product_machine set sort=sort+1 where id=#{id}")