Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev

# Conflicts:
#	jz-dm-manage/src/main/java/com/jz/manage/moduls/service/SysUserService.java

jz-dm-apigateway/src/main/java/com/jz/dm/gateway/filter/CheckArgsFilter.java

 package com.jz.dm.gateway.filter;
 
-import com.jz.dm.gateway.common.util.StringUtil;
 import com.jz.dm.gateway.common.exception.GatewayException;
 import com.jz.dm.gateway.common.util.SignType;
-import com.jz.dm.gateway.gateway.common.Constants;
-import com.jz.dm.gateway.model.enums.Format;
+import com.jz.dm.gateway.common.util.StringUtil;
+import com.jz.dm.gateway.constant.Constants;
 import com.jz.dm.gateway.model.GatewayRequest;
 import com.jz.dm.gateway.model.GatewayResponse;
+import com.jz.dm.gateway.model.enums.Format;
 import com.jz.dm.gateway.model.enums.GatewayResultCode;
 import org.springframework.stereotype.Component;
 

jz-dm-apigateway/src/main/java/com/jz/dm/gateway/filter/CheckPostSizeFilter.java

 package com.jz.dm.gateway.filter;
 
 import com.jz.dm.gateway.common.exception.GatewayException;
-import com.jz.dm.gateway.gateway.common.Constants;
+import com.jz.dm.gateway.constant.Constants;
 import com.jz.dm.gateway.model.GatewayRequest;
 import com.jz.dm.gateway.model.GatewayResponse;
-import com.jz.dm.gateway.model.enums.GatewayResultCode;
 import com.jz.dm.gateway.model.RequestContext;
+import com.jz.dm.gateway.model.enums.GatewayResultCode;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;

jz-dm-apigateway/src/main/java/com/jz/dm/gateway/filter/CheckTimestampFilter.java

 package com.jz.dm.gateway.filter;
 
 import com.jz.dm.gateway.common.exception.GatewayException;
-import com.jz.dm.gateway.gateway.common.Constants;
+import com.jz.dm.gateway.constant.Constants;
 import com.jz.dm.gateway.model.GatewayRequest;
 import com.jz.dm.gateway.model.GatewayResponse;
 import com.jz.dm.gateway.model.enums.GatewayResultCode;

jz-dm-apigateway/src/main/java/com/jz/dm/gateway/filter/InvokeRouteFilter.java

@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.jz.dm.gateway.common.exception.GatewayException;
 import com.jz.dm.gateway.common.util.LogUtil;
+import com.jz.dm.gateway.constant.Constants;
 import com.jz.dm.gateway.constant.LoggingConstants;
 import com.jz.dm.gateway.gateway.DefaultOpenApiDispatcher;
-import com.jz.dm.gateway.gateway.common.Constants;
 import com.jz.dm.gateway.model.*;
 import com.jz.dm.gateway.model.enums.GatewayResultCode;
 import com.jz.dm.gateway.model.enums.RouteType;

jz-dm-apigateway/src/main/java/com/jz/dm/gateway/filter/SignatureFilter.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.PropertyNamingStrategy;
 import com.jz.dm.gateway.common.util.StringUtil;
 import com.jz.dm.gateway.common.exception.SignatureException;
 import com.jz.dm.gateway.common.util.*;
-import com.jz.dm.gateway.gateway.common.Constants;
 import com.jz.dm.gateway.model.GatewayRequest;
 import com.jz.dm.gateway.model.GatewayResponse;
 import com.jz.dm.gateway.model.enums.GatewayResultCode;
@@ -152,7 +151,8 @@ public class SignatureFilter extends AbstractFilter {
      */
     @Override
     public int getOrder() {
-        return Constants.FILTER_ORDER_0;
+        //return Constants.FILTER_ORDER_0;
+        return 0;
     }
 
     @Override

jz-dm-apigateway/src/main/java/com/jz/dm/gateway/model/signtype/SHA1WithRSA.java

 package com.jz.dm.gateway.model.signtype;
 
 
-import com.jz.dm.gateway.gateway.common.Constants;
+import com.jz.dm.gateway.constant.Constants;
 import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
 
 import javax.crypto.Cipher;

jz-dm-common/src/main/java/com/jz/common/exception/GatewayException.java

-package com.jz.common.exception;
-
-
-import com.jz.common.utils.ResultCode;
-
-/**
- * 网关异常
- *
- */
-public class GatewayException extends OpenApiException {
-
-    /** 序列号 */
-    private static final long serialVersionUID = 3391018902219700916L;
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     */
-    public GatewayException(ResultCode resultCode) {
-        super(resultCode);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     * @param cause
-     */
-    public GatewayException(ResultCode resultCode, Throwable cause) {
-        super(resultCode, cause);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     * @param detailMessage
-     */
-    public GatewayException(ResultCode resultCode, String detailMessage) {
-        super(resultCode, detailMessage);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param code
-     * @param msg
-     */
-    public GatewayException(String code, String msg) {
-        this(code, msg, (Throwable) null);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param code
-     * @param msg
-     * @param cause
-     */
-    public GatewayException(String code, String msg, Throwable cause) {
-        super(code, msg, cause);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param code
-     * @param msg
-     * @param detailMessage
-     */
-    public GatewayException(String code, String msg, String detailMessage) {
-        super(code, msg, detailMessage);
-    }
-
-}
\ No newline at end of file

jz-dm-common/src/main/java/com/jz/common/exception/MessageDigestException.java

-package com.jz.common.exception;
-
-
-import com.jz.common.utils.ResultCode;
-
-/**
- * 信息摘要异常
- *
- */
-public class MessageDigestException extends OpenApiException {
-
-    private static final long serialVersionUID = 477249046784548217L;
-
-    /**
-     * 构造函数
-     * @param resultCode
-     */
-    public MessageDigestException(ResultCode resultCode) {
-        super(resultCode);
-    }
-
-    /**
-     * 构造函数
-     * @param resultCode
-     * @param detailMessage
-     */
-    public MessageDigestException(ResultCode resultCode, String detailMessage) {
-        super(resultCode, detailMessage);
-    }
-
-    /**
-     * 构造函数
-     * @param resultCode
-     * @param cause
-     */
-    public MessageDigestException(ResultCode resultCode, Throwable cause) {
-        super(resultCode, cause);
-    }
-
-    /**
-     * 构造函数
-     * @param resultCode
-     * @param detailMessage
-     * @param cause
-     */
-    public MessageDigestException(ResultCode resultCode, String detailMessage, Throwable cause) {
-        super(resultCode, detailMessage, cause);
-    }
-}

jz-dm-common/src/main/java/com/jz/common/exception/NotifyException.java

-package com.jz.common.exception;
-
-
-import com.jz.common.utils.ResultCode;
-
-/**
- * 通知异常
- *
- */
-public class NotifyException extends OpenApiException {
-
-    /** 序列号 */
-    private static final long serialVersionUID = 3391018902219700916L;
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     */
-    public NotifyException(ResultCode resultCode) {
-        super(resultCode);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     * @param cause
-     */
-    public NotifyException(ResultCode resultCode, Throwable cause) {
-        super(resultCode, cause);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     * @param detailMessage
-     */
-    public NotifyException(ResultCode resultCode, String detailMessage) {
-        super(resultCode, detailMessage);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param code
-     * @param msg
-     */
-    public NotifyException(String code, String msg) {
-        this(code, msg, (Throwable) null);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param code
-     * @param msg
-     * @param cause
-     */
-    public NotifyException(String code, String msg, Throwable cause) {
-        super(code, msg, cause);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param code
-     * @param msg
-     * @param detailMessage
-     */
-    public NotifyException(String code, String msg, String detailMessage) {
-        super(code, msg, detailMessage);
-    }
-
-}
\ No newline at end of file

jz-dm-common/src/main/java/com/jz/common/exception/OpenApiException.java

-package com.jz.common.exception;
-
-
-import com.jz.common.utils.ResultCode;
-
-/**
- * openapi异常
- *
- */
-public class OpenApiException extends RuntimeException {
-
-    private static final long serialVersionUID = -3963657380514719229L;
-
-    /**
-     * 结果码
-     */
-    private ResultCode resultCode;
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     */
-    public OpenApiException(ResultCode resultCode) {
-        this.resultCode = new ResultCodeImpl(resultCode);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     * @param cause
-     */
-    public OpenApiException(ResultCode resultCode, Throwable cause) {
-        super(cause);
-        this.resultCode = new ResultCodeImpl(resultCode);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     * @param detailMessage
-     */
-    public OpenApiException(ResultCode resultCode, String detailMessage) {
-        super(detailMessage);
-        this.resultCode = new ResultCodeImpl(resultCode);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     * @param detailMessage
-     * @param cause
-     */
-    public OpenApiException(ResultCode resultCode, String detailMessage, Throwable cause) {
-        super(detailMessage, cause);
-        this.resultCode = new ResultCodeImpl(resultCode);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param code
-     * @param msg
-     */
-    public OpenApiException(String code, String msg) {
-        this(new ResultCodeImpl(code, msg));
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param code
-     * @param msg
-     * @param cause
-     */
-    public OpenApiException(String code, String msg, Throwable cause) {
-        this(new ResultCodeImpl(code, msg), cause);
-    }
-
-    /**
-     * 构造函数
-     * 
-     * @param code
-     * @param msg
-     * @param detailMessage
-     */
-    public OpenApiException(String code, String msg, String detailMessage) {
-        this(new ResultCodeImpl(code, msg), detailMessage);
-    }
-
-    /**
-     * Getter method for property <tt>resultCode</tt>.
-     * 
-     * @return property value of resultCode
-     */
-    public ResultCode getResultCode() {
-        return resultCode;
-    }
-
-    public static class ResultCodeImpl implements ResultCode {
-
-        private String code;
-
-        private String msg;
-
-        public ResultCodeImpl(ResultCode resultCode) {
-            this.code = resultCode.getCode();
-            this.msg = resultCode.getMsg();
-        }
-
-        public ResultCodeImpl(String code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-
-        @Override
-        public String getCode() {
-            return code;
-        }
-
-        @Override
-        public String getMsg() {
-            return msg;
-        }
-
-    }
-
-}

jz-dm-common/src/main/java/com/jz/common/exception/SecretException.java

-package com.jz.common.exception;
-
-
-import com.jz.common.utils.ResultCode;
-
-/**
- * 加密异常
- *
- */
-public class SecretException extends OpenApiException {
-
-    private static final long serialVersionUID = -8597436175649786898L;
-
-    /**
-     * 构造函数
-     * @param resultCode
-     */
-    public SecretException(ResultCode resultCode) {
-        super(resultCode);
-    }
-
-    /**
-     * 构造函数
-     * @param resultCode
-     * @param detailMessage
-     */
-    public SecretException(ResultCode resultCode, String detailMessage) {
-        super(resultCode, detailMessage);
-    }
-
-    /**
-     * 构造函数
-     * @param resultCode
-     * @param cause
-     */
-    public SecretException(ResultCode resultCode, Throwable cause) {
-        super(resultCode, cause);
-    }
-
-    /**
-     * 构造函数
-     * @param resultCode
-     * @param detailMessage
-     * @param cause
-     */
-    public SecretException(ResultCode resultCode, String detailMessage, Throwable cause) {
-        super(resultCode, detailMessage, cause);
-    }
-}

jz-dm-common/src/main/java/com/jz/common/exception/SignatureException.java

-package com.jz.common.exception;
-
-
-import com.jz.common.utils.ResultCode;
-
-/**
- * 签名异常
- *
- */
-public class SignatureException extends OpenApiException {
-
-    private static final long serialVersionUID = 6551962245794846748L;
-
-    /**
-     * 构造函数
-     * 
-     * @param resultCode
-     */
-    public SignatureException(ResultCode resultCode) {
-        super(resultCode);
-    }
-
-    /**
-     * 构造函数
-     * @param resultCode
-     * @param detailMessage
-     */
-    public SignatureException(ResultCode resultCode, String detailMessage) {
-        super(resultCode, detailMessage);
-    }
-
-    /**
-     * 构造函数
-     * @param resultCode
-     * @param cause
-     */
-    public SignatureException(ResultCode resultCode, Throwable cause) {
-        super(resultCode, cause);
-    }
-
-    /**
-     * 构造函数
-     * @param resultCode
-     * @param detailMessage
-     * @param cause
-     */
-    public SignatureException(ResultCode resultCode, String detailMessage, Throwable cause) {
-        super(resultCode, detailMessage, cause);
-    }
-
-}

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/TestUserController.java

@@ -2,13 +2,16 @@ package com.jz.manage.moduls.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jz.common.entity.User;
 import com.jz.common.utils.Result;
-import com.jz.manage.moduls.entity.User;
 import com.jz.manage.moduls.service.TestUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/AuditRecordDao.java

 package com.jz.manage.moduls.mapper;
 
+
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.AuditRecord;
+import com.jz.common.entity.AuditRecord;
 
 /**
  * 审核记录(TAuditRecord)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/DataGoodsApiDao.java

+package com.jz.manage.moduls.mapper;
+
+import com.jz.common.base.BaseMapper;
+import com.jz.common.entity.DataGoodsApi;
+
+/**
+ * api商品(TDataGoodsApi)表数据库访问层
+ *
+ * @author Bellamy
+ * @since 2020-12-01 10:41:31
+ */
+public interface DataGoodsApiDao extends BaseMapper<DataGoodsApi> {
+
+
+
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/DataGoodsApiParamsDao.java

+package com.jz.manage.moduls.mapper;
+
+import com.jz.common.base.BaseMapper;
+import com.jz.common.entity.DataGoodsApiParams;
+
+/**
+ * api商品参数配置(TDataGoodsApiParams)表数据库访问层
+ *
+ * @author Bellamy
+ * @since 2020-12-01 10:41:31
+ */
+public interface DataGoodsApiParamsDao extends BaseMapper<DataGoodsApiParams> {
+
+
+
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/DataGoodsCategoryDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.DataGoodsCategory;
+import com.jz.common.entity.DataGoodsCategory;
 
 /**
  * 数据商品分类(行业)(TDataGoodsCategory)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/DataGoodsDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.DataGoods;
+import com.jz.common.entity.DataGoods;
 
 /**
  * 数据商品(TDataGoods)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/DataGoodsPackDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.DataGoodsPack;
+import com.jz.common.entity.DataGoodsPack;
 
 /**
  * 数据包商品(DataGoodsPack)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/DefinitionApiDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.DefinitionApi;
+import com.jz.common.entity.DefinitionApi;
 
 /**
  * 定义api(TDefinitionApi)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/DefinitionApiParamsDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.DefinitionApiParams;
+import com.jz.common.entity.DefinitionApiParams;
 
 /**
  * API参数表(TDefinitionApiParams)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/DemandDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.Demand;
+import com.jz.common.entity.Demand;
 
 /**
  * 用户需求定制申请(TDemand)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/DepartmentDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.Department;
+import com.jz.common.entity.Department;
 
 /**
  * 企业(TDepartment)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/FileDepositDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.FileDeposit;
+import com.jz.common.entity.FileDeposit;
 
 /**
  * 文件存入表

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/FileHandleStatusDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.FileHandleStatus;
+import com.jz.common.entity.FileHandleStatus;
 
 /**
  * 文件处理状态表

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/FilePretreatmentStatusDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.FilePretreatmentStatus;
+import com.jz.common.entity.FilePretreatmentStatus;
 
 /**
  * 文件预处理状态表

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/FileSaveFieldInfoDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.FileSaveFieldInfo;
+import com.jz.common.entity.FileSaveFieldInfo;
 
 /**
  * 文件存入字段信息表

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/FinanceCashOutDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.FinanceCashOut;
+import com.jz.common.entity.FinanceCashOut;
 
 /**
  * 提现申请(TFinanceCashOut)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/FinanceCustomerAssetsDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.FinanceCustomerAssets;
+import com.jz.common.entity.FinanceCustomerAssets;
 
 /**
  * 商城企业客户资产(TFinanceCustomerAssets)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/FinanceCustomerBalanceDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.FinanceCustomerBalance;
+import com.jz.common.entity.FinanceCustomerBalance;
 
 /**
  * 企业客户充值记录(TFinanceCustomerBalance)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/FinanceTradeFlowDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.FinanceTradeFlow;
+import com.jz.common.entity.FinanceTradeFlow;
 
 /**
  * 企业客户交易流水(TFinanceTradeFlow)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/MallCustomerDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.MallCustomer;
+import com.jz.common.entity.MallCustomer;
 
 /**
  * 商城用户(TMallCustomer)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/MallHotRecommendGoodsDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.MallHotRecommendGoods;
+import com.jz.common.entity.MallHotRecommendGoods;
 
 /**
  * 热门推荐商品(TMallHotRecommendGoods)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/OrderDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.Order;
+import com.jz.common.entity.Order;
 
 /**
  * 订单表(TOrder)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/OrderGoodsInfoDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.OrderGoodsInfo;
+import com.jz.common.entity.OrderGoodsInfo;
 
 /**
  * 订单商品信息(TOrderGoodsInfo)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/OrderPaymentDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.OrderPayment;
+import com.jz.common.entity.OrderPayment;
 
 /**
  * 订单支付(TOrderPayment)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/PlatformAssetsDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.PlatformAssets;
+import com.jz.common.entity.PlatformAssets;
 
 /**
  * 平台资产账户(TPlatformAssets)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/PlatformLogDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.PlatformLog;
+import com.jz.common.entity.PlatformLog;
 
 /**
  * 日志管理(TPlatformLog)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/PlatformPaymenyInfoDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.PlatformPaymenyInfo;
+import com.jz.common.entity.PlatformPaymenyInfo;
 
 /**
  * 平台付款信息(TPlatformPaymenyInfo)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/PlatformTradeFlowInfoDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.PlatformTradeFlowInfo;
+import com.jz.common.entity.PlatformTradeFlowInfo;
 
 /**
  * 平台交易流水(TPlatformTradeFlowInfo)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/PlatfromReceiveInfoDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.PlatfromReceiveInfo;
+import com.jz.common.entity.PlatfromReceiveInfo;
 
 /**
  * 平台收款信息(TPlatfromReceiveInfo)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/SysCodeDao.java

 package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.SysCode;
+import com.jz.common.entity.SysCode;
 
 /**
  * 系统字典(TSysCode)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/TestMapper.java

@@ -3,7 +3,7 @@ package com.jz.manage.moduls.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.User;
+import com.jz.common.entity.User;
 
 import java.util.Map;
 

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/TestUserMapper.java

@@ -3,7 +3,7 @@ package com.jz.manage.moduls.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.User;
+import com.jz.common.entity.User;
 
 import java.util.List;
 import java.util.Map;

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/sys/SysMenuDao.java

 package com.jz.manage.moduls.mapper.sys;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.sys.SysMenu;
+import com.jz.common.entity.sys.SysMenu;
 
 /**
  * 功能菜单(SysMenu)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/sys/SysOrgDao.java

 package com.jz.manage.moduls.mapper.sys;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.sys.SysOrg;
+import com.jz.common.entity.sys.SysOrg;
 
 /**
  * 组织机构表(SysOrg)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/sys/SysRoleDao.java

 package com.jz.manage.moduls.mapper.sys;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.sys.SysRole;
+import com.jz.common.entity.sys.SysRole;
+
 
 /**
  * 角色表(SysRole)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/sys/SysRoleMenuDao.java

 package com.jz.manage.moduls.mapper.sys;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.sys.SysRoleMenu;
+import com.jz.common.entity.sys.SysRoleMenu;
 
 /**
  * (SysRoleMenu)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/sys/SysUserDao.java

 package com.jz.manage.moduls.mapper.sys;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.sys.SysUser;
+import com.jz.common.entity.sys.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/sys/SysUserRoleDao.java

 package com.jz.manage.moduls.mapper.sys;
 
 import com.jz.common.base.BaseMapper;
-import com.jz.manage.moduls.entity.sys.SysUserRole;
+import com.jz.common.entity.sys.SysUserRole;
 
 /**
  * (SysUserRole)表数据库访问层

jz-dm-manage/src/main/java/com/jz/manage/moduls/service/SysUserService.java

 package com.jz.manage.moduls.service;
 
+
 import com.jz.common.entity.sys.SysUser;
 
 import java.util.Map;

jz-dm-manage/src/main/java/com/jz/manage/moduls/service/TestUserService.java

@@ -2,7 +2,7 @@ package com.jz.manage.moduls.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jz.manage.moduls.entity.User;
+import com.jz.common.entity.User;
 
 import java.util.List;
 import java.util.Map;

jz-dm-manage/src/main/java/com/jz/manage/moduls/service/impl/SysUserServiceImpl.java

 package com.jz.manage.moduls.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jz.common.entity.sys.SysUser;
 import com.jz.manage.moduls.mapper.sys.SysUserDao;
-import com.jz.manage.moduls.entity.sys.SysUser;
 import com.jz.manage.moduls.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

jz-dm-manage/src/main/java/com/jz/manage/moduls/service/impl/UserServiceImpl.java

@@ -3,9 +3,9 @@ package com.jz.manage.moduls.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jz.common.entity.User;
 import com.jz.manage.moduls.mapper.TestMapper;
 import com.jz.manage.moduls.mapper.TestUserMapper;
-import com.jz.manage.moduls.entity.User;
 import com.jz.manage.moduls.service.TestUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

jz-dm-manage/src/main/resources/mapper/goods/DataGoodsApiDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jz.manage.moduls.mapper.DataGoodsApiDao">
+
+    <resultMap type="com.jz.common.entity.DataGoodsApi" id="TDataGoodsApiMap">
+        <result property="goodsApi" column="goods_api" jdbcType="INTEGER"/>
+        <result property="dataGoodsId" column="data_goods_id" jdbcType="INTEGER"/>
+        <result property="apiName" column="api_name" jdbcType="VARCHAR"/>
+        <result property="requestType" column="request_type" jdbcType="VARCHAR"/>
+        <result property="apiUrl" column="api_url" jdbcType="VARCHAR"/>
+        <result property="apiMethod" column="api_method" jdbcType="VARCHAR"/>
+        <result property="apiProtocl" column="api_protocl" jdbcType="VARCHAR"/>
+        <result property="returnDataExample" column="return_data_example" jdbcType="VARCHAR"/>
+        <result property="requestExample" column="request_example" jdbcType="VARCHAR"/>
+        <result property="returnType" column="return_type" jdbcType="VARCHAR"/>
+        <result property="apiKey" column="api_key" jdbcType="VARCHAR"/>
+        <result property="creTime" column="cre_time" jdbcType="TIMESTAMP"/>
+        <result property="crePerson" column="cre_person" jdbcType="VARCHAR"/>
+        <result property="uptPerson" column="upt_person" jdbcType="VARCHAR"/>
+        <result property="uptTime" column="upt_time" jdbcType="TIMESTAMP"/>
+        <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>
+    </resultMap>
+
+
+
+</mapper>
\ No newline at end of file

jz-dm-manage/src/main/resources/mapper/goods/DataGoodsApiParamsDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jz.manage.moduls.mapper.DataGoodsApiParamsDao">
+
+    <resultMap type="com.jz.common.entity.DataGoodsApiParams" id="TDataGoodsApiParamsMap">
+        <result property="apiParamsId" column="api_params_id" jdbcType="INTEGER"/>
+        <result property="goodsApi" column="goods_api" jdbcType="INTEGER"/>
+        <result property="paramsDiff" column="params_diff" jdbcType="VARCHAR"/>
+        <result property="paramsName" column="params_name" jdbcType="VARCHAR"/>
+        <result property="paramsType" column="params_type" jdbcType="VARCHAR"/>
+        <result property="paramsDesc" column="params_desc" jdbcType="VARCHAR"/>
+        <result property="defaultValue" column="default_value" jdbcType="VARCHAR"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="ifRequird" column="if_requird" jdbcType="VARCHAR"/>
+        <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>
+        <result property="creTime" column="cre_time" jdbcType="TIMESTAMP"/>
+        <result property="uptTime" column="upt_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file