Merge branch 'release/s4' into develop

.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

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;

demo-athenaopt_backend/pom.xml

@@ -32,10 +32,12 @@
         <nexus.ip>https://repo.digiwincloud.com.cn/maven</nexus.ip>
         <revision>1.1.0.0</revision>
         <spring.version>5.0.5.RELEASE</spring.version>
-        <api.version>5.2.0.1086</api.version>
+        <api.version>5.2.0.1109</api.version>
         <dwgson.version>2.8.6</dwgson.version>
         <DWQueue.version>1.05</DWQueue.version>
         <netty.version>4.1.67.Final</netty.version>
+        <!--解决模型驱动升级报错-->
+        <lettuce.version>5.3.4.RELEASE</lettuce.version>
     </properties>
     <dependencies>
 
@@ -67,7 +69,7 @@
         <dependency>
             <groupId>com.digiwin.lcdp</groupId>
             <artifactId>lcdp-modeldriven</artifactId>
-            <version>1.0.1.40</version>
+            <version>1.0.2.62</version>
         </dependency>
 
         <dependency>

version_control/BUILD

@@ -1 +1 @@
-1020
+1021