From 9f2d0cfd26e85d812efac1a8013c0b46117abc83 Mon Sep 17 00:00:00 2001 From: robot Date: Fri, 16 Aug 2024 03:35:48 +0000 Subject: [PATCH 1/4] auto increment build version 1021 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 49efa1e..8463e09 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1020 +1021 From d5ac25793588339899fd8720ea718da26424eeb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=A3=AE=E5=A3=AE?= Date: Mon, 20 Jan 2025 17:22:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=E6=A8=A1=E5=9E=8B=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-athenaopt_backend/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml index d7421df..b3ed6ca 100644 --- a/demo-athenaopt_backend/pom.xml +++ b/demo-athenaopt_backend/pom.xml @@ -32,7 +32,7 @@ https://repo.digiwincloud.com.cn/maven 1.1.0.0 5.0.5.RELEASE - 5.2.0.1086 + 5.2.0.1109 2.8.6 1.05 4.1.67.Final @@ -67,7 +67,7 @@ com.digiwin.lcdp lcdp-modeldriven - 1.0.1.40 + 1.0.2.62 From 4dcae9dd127886a464b467f2b497d17211947e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=A3=AE=E5=A3=AE?= Date: Mon, 20 Jan 2025 18:02:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=E6=A8=A1=E5=9E=8B=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- demo-athenaopt_backend/pom.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e85ec32..8988d4e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ steps: # 应用专案名称（需手动修改） backendName: demo-athenaopt_backend # 平台API版本号（需手动修改） - apiVersion: 5.2.0.1086 + apiVersion: 5.2.0.1109 commands: # 在开发根目录下执行 maven package 指令以构建运行包 - mvn -f $backendName/pom.xml package -Dapi.version=$apiVersion -Dnexus.ip=https://repo.digiwincloud.com.cn/maven diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml index b3ed6ca..e5afd83 100644 --- a/demo-athenaopt_backend/pom.xml +++ b/demo-athenaopt_backend/pom.xml @@ -36,6 +36,8 @@ 2.8.6 1.05 4.1.67.Final + + 5.3.4.RELEASE From 6586962332bf672e231716a7d944aa7380ccdd23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=A3=AE=E5=A3=AE?= Date: Tue, 21 Jan 2025 09:17:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor:LimitCreditEntity=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../athena/app/ptc/infra/entity/LimitCreditEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/infra/entity/LimitCreditEntity.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/infra/entity/LimitCreditEntity.java index db10bd9..06d5b37 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/infra/entity/LimitCreditEntity.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/infra/entity/LimitCreditEntity.java @@ -1,5 +1,7 @@ package com.digiwin.athena.app.ptc.infra.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.google.gson.annotations.SerializedName; import lombok.AllArgsConstructor; @@ -20,6 +22,10 @@ import java.math.BigDecimal; @TableName(value = "cim_limit_credit", autoResultMap = true) public class LimitCreditEntity { + @SerializedName(value = "id") + @TableId(value = "id",type = IdType.INPUT) + private Long id; + /** 客户编号 */ @SerializedName(value = "customer_no") private String customerNo;