diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java
index 9944e98c..152eb851 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java
@@ -20,6 +20,7 @@ public class MdmDBQueryVO extends BaseEntity {
private String prop9;
private String prop10;
private String prop11;
+ private String prop12;
private String propValue1;
private String propValue2;
@@ -32,6 +33,7 @@ public class MdmDBQueryVO extends BaseEntity {
private String propValue9;
private String propValue10;
private String propValue11;
+ private String propValue12;
private String pkentityorg;
private String billstatus;
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
index 3526e078..df2e47ff 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
@@ -90,6 +90,7 @@
and ${prop9}=#{propValue9}
and ${prop10}=#{propValue10}
and ${prop11} is ${propValue11}
+ and ${prop12} = #{propValue12}
and billstatus = #{billstatus}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/vo/CreateVoucherVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/vo/CreateVoucherVO.java
index 46686909..94dc444f 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/vo/CreateVoucherVO.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/vo/CreateVoucherVO.java
@@ -43,6 +43,19 @@ public class CreateVoucherVO extends BaseEntity {
private String examine_status;
+ /**
+ * 【项目性质】 【投资类/非投资类】
+ */
+ private String xmxztzftz;//TZL/FTZL
+
+ public String getXmxztzftz() {
+ return xmxztzftz;
+ }
+
+ public void setXmxztzftz(String xmxztzftz) {
+ this.xmxztzftz = xmxztzftz;
+ }
+
public String getMdmId() {
return mdmId;
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java
index da27dda7..218e8d9e 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java
@@ -368,6 +368,18 @@ public class AePushVoucherLogServiceImpl extends BaseService> maps = mdmDBQueryVODAO.queryDataByMdmId(mdmDBQueryVO);
diff --git a/base-buildpackage/src/main/resources/application-gmprod.yml b/base-buildpackage/src/main/resources/application-gmprod.yml
index 7a874368..62a3b900 100644
--- a/base-buildpackage/src/main/resources/application-gmprod.yml
+++ b/base-buildpackage/src/main/resources/application-gmprod.yml
@@ -12,7 +12,7 @@ spring:
dynamic:
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/bussinesscenter_voucher_gm?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true
+ url: jdbc:mysql://127.0.0.1:3306/businesscenter_voucher_gm_250907?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true
username: root
password: bd993088e8a7c3dc5f44441617f9b4bf
driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置