Merge remote-tracking branch 'origin/pOrder-241125' into uat

# Conflicts:
#	suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

@@ -104,6 +104,7 @@ public class HanaOrderComponent {
                 "                T.KVGR4,\n" +
                 "                T.POSID, \n" +
                 "               T.PD_NO,\n"+
+                "               T.BSTKD,\n"+
                 "               T.NETPR,\n"+
                 "               T.NTGEW_MARA,\n"+
                 "               T.PSTYV,\n"+
@@ -159,6 +160,7 @@ public class HanaOrderComponent {
                 "                A.KVGR4, "+
                 "                A.POSID, "+
                 "               A.PD_NO, "+
+                "               A.BSTKD,"+
                 "               A.NETPR, "+
                 "               A.NTGEW_MARA,"+
                 "               A.PSTYV,"+
@@ -368,6 +370,7 @@ public class HanaOrderComponent {
                                 +"$$"+ result.getString("KVGR4")
                                 +"$$"+ result.getString("POSID")
                                 +"$$"+ result.getString("PD_NO")
+                                +"$$"+ result.getString("BSTKD")
                                 +"$$"+ result.getString("NETPR")
                                 +"$$"+ result.getString("NTGEW_MARA")
                                 +"$$"+ result.getString("PSTYV")