Merge remote-tracking branch 'origin/order-2482' 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

@@ -106,6 +106,7 @@ public class HanaOrderComponent {
                 "               T.PD_NO,\n"+
                 "               T.NETPR,\n"+
                 "               T.NTGEW_MARA,\n"+
+                "               T.PSTYV,\n"+
                 "                T.BSTKD_E \n"+
                 "FROM (\n" +
                 "\n" +
@@ -159,6 +160,7 @@ public class HanaOrderComponent {
                 "               A.PD_NO, "+
                 "               A.NETPR, "+
                 "               A.NTGEW_MARA,"+
+                "               A.PSTYV,"+
                 "                A.BSTKD_E "+
                 "FROM \"_SYS_BIC\".\"com.sd/CAL_SALES\"" +
                 "('PLACEHOLDER' = ('$$IP_ENDDATE$$',\n" +
@@ -366,6 +368,7 @@ public class HanaOrderComponent {
                                 +"$$"+ result.getString("PD_NO")
                                 +"$$"+ result.getString("NETPR")
                                 +"$$"+ result.getString("NTGEW_MARA")
+                                +"$$"+ result.getString("PSTYV")
                                 +"$$"+ result.getString("BSTKD_E")
                                 + "\r\n");