diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java index 0b11edac1..500d9bf1e 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java @@ -1,17 +1,15 @@ package com.czg.controller.admin; import com.alibaba.fastjson2.JSONObject; -import com.czg.BaseQueryParam; import com.czg.EntryManager; import com.czg.annotation.Debounce; import com.czg.dto.req.AggregateMerchantDto; import com.czg.dto.resp.BankBranchDto; import com.czg.order.entity.ShopDirectMerchant; +import com.czg.resp.CzgResult; import com.czg.service.order.dto.AggregateMerchantVO; import com.czg.service.order.dto.MerchantQueryDTO; import com.czg.service.order.service.ShopDirectMerchantService; -import com.czg.resp.CzgResult; -import com.czg.sa.StpKit; import com.czg.task.EntryManagerTask; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; @@ -67,7 +65,7 @@ public class EntryManagerController { } /** - * 获取进件信息 + * 获取进件列表 */ @GetMapping("list") public CzgResult> getEntryList(MerchantQueryDTO queryParam) { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java index 3f332b18a..504792a74 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java @@ -38,11 +38,13 @@ public class ShopDirectMerchant implements Serializable { /** * 店铺名称 */ + @Column(ignore = true) private String shopName; /** * 营业执照编号 */ + @Id private String licenceNo; /** * 支付宝账号