Merge branch 'demo_bank_20231123' into test

performance-web/src/main/java/com/clx/performance/controller/temp/TempYftBankController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 
@@ -73,7 +74,7 @@ public class TempYftBankController {
             jsonObject.put("transId", "IP01");      //交易识别码 必填
             jsonObject.put("merId", "EFT33021200556315");     //商户号 必填
 
-            jsonObject.put("merSeqNo", DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));     //商户流水 必填
+            jsonObject.put("merSeqNo", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));     //商户流水 必填
             jsonObject.put("merDtTm", LocalDateTimeUtils.formatTime());     //商户时间 必填
 
             jsonObject.put("trxAmt", "1.23");     //订单金额 必填