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,12 +104,12 @@ public class HanaOrderComponent {
                 "                T.KVGR4,\n" +
                 "                T.POSID, \n" +
                 "               T.PD_NO,\n"+
-                "               T.BSTKD,\n"+
+                "\t replace(replace(T.BSTKD,CHAR(10),''),CHAR(13),'') BSTKD, \n" +
                 "               T.NETPR,\n"+
                 "               T.NTGEW_MARA,\n"+
                 "               T.PSTYV,\n"+
-                "               T.UEPOS,\n"+
-                "                T.BSTKD_E \n"+
+                "               T.UEPOS, \n"+
+                "\t replace(replace(T.BSTKD_E,CHAR(10),''),CHAR(13),'') BSTKD_E \n" +
                 "FROM (\n" +
                 "\n" +
                 "SELECT\n" +