Merge remote-tracking branch 'origin/hana数据乱码处理' into uat

suishenbang-admin/src/main/resources/application-uat.yml

@@ -26,10 +26,14 @@ customer:
 
 #hana数据库数据同步配置
 hana:
+#  hana-driver: com.sap.db.jdbc.Driver
+#  hana-url: jdbc:sap://hanaentsltd.nipponpaint.com.cn:30015?reconnect=true
+#  hana-user: SSB_HANA
+#  hana-pwd: s$EW12445T
   hana-driver: com.sap.db.jdbc.Driver
-  hana-url: jdbc:sap://hanaentsltd.nipponpaint.com.cn:30015?reconnect=true
+  hana-url: jdbc:sap://hanaentsltp.nipponpaint.com.cn:30015?reconnect=true
   hana-user: SSB_HANA
-  hana-pwd: s$EW12445T
+  hana-pwd: Erty567*
   mysql-driver: com.mysql.jdbc.Driver
   mysql-url: jdbc:mysql://pc-uf637rafh16b6nl16.rwlb.rds.aliyuncs.com:3306/ssbtest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
   mysql-user: ssbtest

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

@@ -164,7 +164,7 @@ public class HanaOrderComponent {
                 "                A.KVGR4, "+
                 "                A.POSID, "+
                 "               A.PD_NO, "+
-                "               A.BSTKD,"+
+                "              REPLACE(A.BSTKD, '$', ''), "+
                 "               A.NETPR, "+
                 "               A.NTGEW_MARA,"+
                 "               A.PSTYV,"+