From 780b7f5d155bdfd69ccece39afc7d79fec94c3eb Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 1 Mar 2023 19:28:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E7=AC=AC=E4=B8=89=E6=96=B9?=
=?UTF-8?q?=E7=B3=BB=E7=BB=9FAPI=E8=A1=A8=E5=AE=9E=E4=BD=93=E7=B1=BB?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=202.=E8=B0=83=E6=95=B4=E5=BC=80=E5=8F=91?=
=?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=A9=B1=E5=8A=A8=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/thrsys/ThrSystemBusApiEntity.java | 17 +++++++++--------
src/main/resources/application-dev.yml | 4 ++--
src/main/resources/application.yml | 2 +-
.../mapper/thrsys/ThrSystemBusApiDao.xml | 3 +--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrSystemBusApiEntity.java b/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrSystemBusApiEntity.java
index 01a70e5..fc7fc93 100644
--- a/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrSystemBusApiEntity.java
+++ b/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrSystemBusApiEntity.java
@@ -19,12 +19,6 @@ public class ThrSystemBusApiEntity {
@TableField(value = "`name`")
private String name;
- /**
- * 第三方系统单据类型名称
- */
- @TableField(value = "thirdBuyName")
- private String thirdBuyName;
-
/**
* 第三方系统单据类型代码
*/
@@ -61,14 +55,21 @@ public class ThrSystemBusApiEntity {
@TableField(value = "filed4")
private String filed4;
+
+ @TableField(exist = false)
+ private Integer inoutType;
+ @TableField(exist = false)
+ private String thirdBuyName; //第三方系统单据类型名称
+
+
+ private static final long serialVersionUID = 1L;
+
public static final String COL_ID = "id";
public static final String COL_CODE = "code";
public static final String COL_NAME = "name";
- public static final String COL_THIRDBUYNAME = "thirdBuyName";
-
public static final String COL_THIRDBUYCODE = "thirdBuyCode";
public static final String COL_THIRDSYS = "thirdSys";
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fce627a..6048890 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+ driver-class-name: com.p6spy.engine.spy.P6SpyDriver
+ url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: Glxp@6066
hikari:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1d8b44a..bc69538 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
server:
port: 9997
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml
index 20683d7..20a8221 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml
@@ -7,7 +7,6 @@
<id column="id" jdbcType="INTEGER" property="id" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" />
- <result column="thirdBuyName" jdbcType="VARCHAR" property="thirdBuyName" />
<result column="thirdBuyCode" jdbcType="VARCHAR" property="thirdBuyCode" />
<result column="thirdSys" jdbcType="VARCHAR" property="thirdSys" />
<result column="url" jdbcType="VARCHAR" property="url" />
@@ -21,7 +20,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, code, `name`, thirdBuyName, thirdBuyCode, thirdSys, url, `type`, remark, filed,
+ id, code, `name`, thirdBuyCode, thirdSys, url, `type`, remark, filed,
filed1, filed2, filed3, filed4
</sql>
</mapper>
\ No newline at end of file