基本增删改查

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderCargoPlaceEntity.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("cst_order_cargo_place")
+@TableName(value = "cst_order_cargo_place", autoResultMap = true)
 public class OrderCargoPlaceEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("cst_order")
+@TableName(value = "cst_order", autoResultMap = true)
 public class OrderEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseDetailEntity.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("cst_order_expense_detail")
+@TableName(value = "cst_order_expense_detail", autoResultMap = true)
 public class OrderExpenseDetailEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("cst_order_expense_items")
+@TableName(value = "cst_order_expense_items", autoResultMap = true)
 public class OrderExpenseItemsEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("cst_order_trans")
+@TableName(value = "cst_order_trans", autoResultMap = true)
 public class OrderTransEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java

@@ -20,7 +20,7 @@ import java.time.LocalDate;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("cst_project")
+@TableName(value = "cst_project", autoResultMap = true)
 public class ProjectEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("cst_station")
+@TableName(value = "cst_station", autoResultMap = true)
 public class StationEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ExpenseItemCategory.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.finance.expenseItem.constant;
+package com.njzscloud.dispose.finance.constant;
 
 import com.njzscloud.common.core.ienum.DictStr;
 import lombok.Getter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ExpenseStrategy.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.finance.expenseItem.constant;
+package com.njzscloud.dispose.finance.constant;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/Payer.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.finance.expenseItem.constant;
+package com.njzscloud.dispose.finance.constant;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/constant/ScopeStrategy.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.finance.expenseItem.constant;
+package com.njzscloud.dispose.finance.constant;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/BillController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.dispose.finance.bill.controller;
+package com.njzscloud.dispose.finance.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity;
-import com.njzscloud.dispose.finance.bill.service.BillService;
+import com.njzscloud.dispose.finance.pojo.entity.BillEntity;
+import com.njzscloud.dispose.finance.service.BillService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/ExpenseItemController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.dispose.finance.expenseItem.controller;
+package com.njzscloud.dispose.finance.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity;
-import com.njzscloud.dispose.finance.expenseItem.service.ExpenseItemService;
+import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity;
+import com.njzscloud.dispose.finance.service.ExpenseItemService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/MoneyAccountController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.dispose.finance.moneyAccount.controller;
+package com.njzscloud.dispose.finance.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity;
-import com.njzscloud.dispose.finance.moneyAccount.service.MoneyAccountService;
+import com.njzscloud.dispose.finance.pojo.entity.MoneyAccountEntity;
+import com.njzscloud.dispose.finance.service.MoneyAccountService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/controller/MoneyFlowController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.dispose.finance.moneyFlow.controller;
+package com.njzscloud.dispose.finance.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity;
-import com.njzscloud.dispose.finance.moneyFlow.service.MoneyFlowService;
+import com.njzscloud.dispose.finance.pojo.entity.MoneyFlowEntity;
+import com.njzscloud.dispose.finance.service.MoneyFlowService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/BillMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.dispose.finance.bill.mapper;
+package com.njzscloud.dispose.finance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity;
+import com.njzscloud.dispose.finance.pojo.entity.BillEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/ExpenseItemMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.dispose.finance.expenseItem.mapper;
+package com.njzscloud.dispose.finance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity;
+import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/MoneyAccountMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.dispose.finance.moneyAccount.mapper;
+package com.njzscloud.dispose.finance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity;
+import com.njzscloud.dispose.finance.pojo.entity.MoneyAccountEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/mapper/MoneyFlowMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.dispose.finance.moneyFlow.mapper;
+package com.njzscloud.dispose.finance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity;
+import com.njzscloud.dispose.finance.pojo.entity.MoneyFlowEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/BillEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.finance.bill.pojo.entity;
+package com.njzscloud.dispose.finance.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;
@@ -18,7 +18,7 @@ import java.time.LocalDate;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("fin_bill")
+@TableName(value = "fin_bill", autoResultMap = true)
 public class BillEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/ExpenseItemEntity.java

@@ -1,13 +1,13 @@
-package com.njzscloud.dispose.finance.expenseItem.pojo.entity;
+package com.njzscloud.dispose.finance.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;
-import com.njzscloud.dispose.finance.expenseItem.constant.ExpenseItemCategory;
-import com.njzscloud.dispose.finance.expenseItem.constant.ExpenseStrategy;
-import com.njzscloud.dispose.finance.expenseItem.constant.Payer;
+import com.njzscloud.dispose.finance.constant.ExpenseItemCategory;
+import com.njzscloud.dispose.finance.constant.ExpenseStrategy;
+import com.njzscloud.dispose.finance.constant.Payer;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -24,7 +24,7 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("fin_expense_item")
+@TableName(value = "fin_expense_item", autoResultMap = true)
 public class ExpenseItemEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/MoneyAccountEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.finance.moneyAccount.pojo.entity;
+package com.njzscloud.dispose.finance.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;
@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("fin_money_account")
+@TableName(value = "fin_money_account", autoResultMap = true)
 public class MoneyAccountEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/pojo/entity/MoneyFlowEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.finance.moneyFlow.pojo.entity;
+package com.njzscloud.dispose.finance.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;
@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("fin_money_flow")
+@TableName(value = "fin_money_flow", autoResultMap = true)
 public class MoneyFlowEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/BillService.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.finance.bill.service;
+package com.njzscloud.dispose.finance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity;
+import com.njzscloud.dispose.finance.pojo.entity.BillEntity;
 
 import java.util.List;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/ExpenseItemService.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.finance.expenseItem.service;
+package com.njzscloud.dispose.finance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity;
+import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity;
 
 import java.util.List;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/MoneyAccountService.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.finance.moneyAccount.service;
+package com.njzscloud.dispose.finance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity;
+import com.njzscloud.dispose.finance.pojo.entity.MoneyAccountEntity;
 
 import java.util.List;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/MoneyFlowService.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.finance.moneyFlow.service;
+package com.njzscloud.dispose.finance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity;
+import com.njzscloud.dispose.finance.pojo.entity.MoneyFlowEntity;
 
 import java.util.List;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/BillServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njzscloud.dispose.finance.bill.service.impl;
+package com.njzscloud.dispose.finance.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.bill.mapper.BillMapper;
-import com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity;
-import com.njzscloud.dispose.finance.bill.service.BillService;
+import com.njzscloud.dispose.finance.mapper.BillMapper;
+import com.njzscloud.dispose.finance.pojo.entity.BillEntity;
+import com.njzscloud.dispose.finance.service.BillService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/ExpenseItemServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njzscloud.dispose.finance.expenseItem.service.impl;
+package com.njzscloud.dispose.finance.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.expenseItem.mapper.ExpenseItemMapper;
-import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity;
-import com.njzscloud.dispose.finance.expenseItem.service.ExpenseItemService;
+import com.njzscloud.dispose.finance.mapper.ExpenseItemMapper;
+import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity;
+import com.njzscloud.dispose.finance.service.ExpenseItemService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/MoneyAccountServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njzscloud.dispose.finance.moneyAccount.service.impl;
+package com.njzscloud.dispose.finance.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.moneyAccount.mapper.MoneyAccountMapper;
-import com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity;
-import com.njzscloud.dispose.finance.moneyAccount.service.MoneyAccountService;
+import com.njzscloud.dispose.finance.mapper.MoneyAccountMapper;
+import com.njzscloud.dispose.finance.pojo.entity.MoneyAccountEntity;
+import com.njzscloud.dispose.finance.service.MoneyAccountService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/service/impl/MoneyFlowServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njzscloud.dispose.finance.moneyFlow.service.impl;
+package com.njzscloud.dispose.finance.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.moneyFlow.mapper.MoneyFlowMapper;
-import com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity;
-import com.njzscloud.dispose.finance.moneyFlow.service.MoneyFlowService;
+import com.njzscloud.dispose.finance.mapper.MoneyFlowMapper;
+import com.njzscloud.dispose.finance.pojo.entity.MoneyFlowEntity;
+import com.njzscloud.dispose.finance.service.MoneyFlowService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsCategoryController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.dispose.goods.goodscategory.controller;
+package com.njzscloud.dispose.goods.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity;
-import com.njzscloud.dispose.goods.goodscategory.service.GoodsCategoryService;
+import com.njzscloud.dispose.goods.pojo.entity.GoodsCategoryEntity;
+import com.njzscloud.dispose.goods.service.GoodsCategoryService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.dispose.goods.goods.controller;
+package com.njzscloud.dispose.goods.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity;
-import com.njzscloud.dispose.goods.goods.service.GoodsService;
+import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity;
+import com.njzscloud.dispose.goods.service.GoodsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsCategoryMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.dispose.goods.goodscategory.mapper;
+package com.njzscloud.dispose.goods.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity;
+import com.njzscloud.dispose.goods.pojo.entity.GoodsCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.dispose.goods.goods.mapper;
+package com.njzscloud.dispose.goods.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity;
+import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/pojo/entity/GoodsCategoryEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.goods.goodscategory.pojo.entity;
+package com.njzscloud.dispose.goods.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("gds_goods_category")
+@TableName(value = "gds_goods_category", autoResultMap = true)
 public class GoodsCategoryEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/pojo/entity/GoodsEntity.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.goods.goods.pojo.entity;
+package com.njzscloud.dispose.goods.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;
-import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity;
+import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("gds_goods")
+@TableName(value = "gds_goods", autoResultMap = true)
 public class GoodsEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsCategoryService.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.goods.goodscategory.service;
+package com.njzscloud.dispose.goods.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity;
+import com.njzscloud.dispose.goods.pojo.entity.GoodsCategoryEntity;
 
 import java.util.List;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsService.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.goods.goods.service;
+package com.njzscloud.dispose.goods.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity;
+import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity;
 
 import java.util.List;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsCategoryServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njzscloud.dispose.goods.goodscategory.service.impl;
+package com.njzscloud.dispose.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.goods.goodscategory.mapper.GoodsCategoryMapper;
-import com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity;
-import com.njzscloud.dispose.goods.goodscategory.service.GoodsCategoryService;
+import com.njzscloud.dispose.goods.mapper.GoodsCategoryMapper;
+import com.njzscloud.dispose.goods.pojo.entity.GoodsCategoryEntity;
+import com.njzscloud.dispose.goods.service.GoodsCategoryService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsServiceImpl.java

@@ -1,16 +1,16 @@
-package com.njzscloud.dispose.goods.goods.service.impl;
+package com.njzscloud.dispose.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.finance.expenseItem.constant.ExpenseItemCategory;
-import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity;
-import com.njzscloud.dispose.finance.expenseItem.service.ExpenseItemService;
-import com.njzscloud.dispose.goods.goods.mapper.GoodsMapper;
-import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity;
-import com.njzscloud.dispose.goods.goods.service.GoodsService;
+import com.njzscloud.dispose.finance.constant.ExpenseItemCategory;
+import com.njzscloud.dispose.finance.pojo.entity.ExpenseItemEntity;
+import com.njzscloud.dispose.finance.service.ExpenseItemService;
+import com.njzscloud.dispose.goods.mapper.GoodsMapper;
+import com.njzscloud.dispose.goods.pojo.entity.GoodsEntity;
+import com.njzscloud.dispose.goods.service.GoodsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;