From b9d7c96a80211f2db97122f2510f493a97bf0ff5 Mon Sep 17 00:00:00 2001
From: robot <robot@digiwin.com>
Date: Mon, 14 Aug 2023 06:25:13 +0000
Subject: [PATCH 1/3] auto increment build version 1047 [CI SKIP]

---
 version_control/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version_control/BUILD b/version_control/BUILD
index 0d38a9b..0eb5aea 100644
--- a/version_control/BUILD
+++ b/version_control/BUILD
@@ -1 +1 @@
-1046
+1047

From c9e27818260002108fdac4a913deb729917847ed Mon Sep 17 00:00:00 2001
From: dongsk <dongsk@digiwin.com>
Date: Mon, 14 Aug 2023 14:39:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=80=E5=90=AFDWDAO=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20for=20=20=E6=A8=A1=E5=9E=8B=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo-athenaopt_backend/develop/conf/application.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo-athenaopt_backend/develop/conf/application.properties b/demo-athenaopt_backend/develop/conf/application.properties
index 408b0b5..9756e34 100644
--- a/demo-athenaopt_backend/develop/conf/application.properties
+++ b/demo-athenaopt_backend/develop/conf/application.properties
@@ -44,13 +44,13 @@ dwdaoSelectVersionFieldEnabled=@dwdaoSelectVersionFieldEnabled@
 #example - false:com.digiwin.app.dao.filter.DWSQLManagementFieldFilter,
 dwsqlFilterChianCustom=@dwsqlFilterChianCustom@
 #management field enabled
-mgmtFieldEnabled=false
+mgmtFieldEnabled=true
 #management field resolver class name
 #dap default resolver = com.digiwin.app.dao.filter.DWProfileManagementFieldResolver
 mgmtFieldResolver=com.digiwin.app.dao.filter.DWProfileManagementFieldResolver
 #management fields mappings
 #example - DATA_CREATED_BY:userId,DATA_MODIFY_BY:userId
-mgmtFieldInsertMappings=create_by:userId,create_date:$DATETIME
+mgmtFieldInsertMappings=create_by:userId,modified_by:userId,create_date:$DATETIME
 mgmtFieldUpdateMappings=modified_by:userId,modified_date:$DATETIME
 mgmtFieldIgnoreCustomValue=false
 #Log file name id: Ex. Windows:_${env:COMPUTERNAME} Linux:_${env:HOSTNAME}
@@ -66,7 +66,7 @@ dwServiceChainReceivedPrinterType=@dwServiceChainReceivedPrinterType@
 #DWJson enable empty string to null
 dwJsonEmptyStrToNullEnabled=@dwJsonEmptyStrToNullEnabled@
 #DWDao underscore-to-camel-case setting
-dwDaoUnderScoreToCamelCase=@dwDaoUnderScoreToCamelCase@
+dwDaoUnderScoreToCamelCase=true
 #DWMq
 dwMqEnabled=@dwMqEnabled@
 dwMqProtocol=@dwMqProtocol@

From 1e48e8d3ceb693b3853197925b39bba6267d63c4 Mon Sep 17 00:00:00 2001
From: dongsk <dongsk@digiwin.com>
Date: Mon, 14 Aug 2023 14:42:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=8D=87=E7=BA=A7=201.0.?=
 =?UTF-8?q?0=3D>1.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                  | 10 +++++-----
 VERSION                     |  2 +-
 version_control/APP_VERSION |  2 +-
 version_control/BUILD       |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 232147c..5d03979 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,7 +25,7 @@ steps:
       branch:
         # - develop
         # - master
-        - develop
+        - release/S2
       event:
         - push
   ### 应用版本控制：检查版本文件，若不存在则自动创建，并自动递增版本号
@@ -45,7 +45,7 @@ steps:
       branch:
         # - develop
         # - master
-        - develop
+        - release/S2
       event:
         - push
   ### 打包镜像并推送到镜像仓库
@@ -76,7 +76,7 @@ steps:
       branch:
         # - develop
         # - master
-        - develop
+        - release/S2
   ### 应用版本控制：提交版本文件的修改记录，并为代码分支创建版本号标签
   - name: Upload Version
     image: registry.digiwincloud.com.cn/base/base_vc
@@ -89,14 +89,14 @@ steps:
       branch:
         # - develop
         # - master
-        - develop
+        - release/S2
       event:
         - push
 trigger:
   branch:
     # - develop
     # - master
-    - develop
+    - release/S2
   event:
     - push
 volumes:
diff --git a/VERSION b/VERSION
index afaf360..7f20734 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0
\ No newline at end of file
+1.0.1
\ No newline at end of file
diff --git a/version_control/APP_VERSION b/version_control/APP_VERSION
index 3eefcb9..7dea76e 100644
--- a/version_control/APP_VERSION
+++ b/version_control/APP_VERSION
@@ -1 +1 @@
-1.0.0
+1.0.1
diff --git a/version_control/BUILD b/version_control/BUILD
index 0eb5aea..a6905f8 100644
--- a/version_control/BUILD
+++ b/version_control/BUILD
@@ -1 +1 @@
-1047
+999