Commit Graph

1270 Commits

Author SHA1 Message Date
wanglf3 222d5b9724 1.添加Location 数据根据携程数据表更新 2024-03-04 08:14:50 +08:00
huangxh3 3df1f58b03 Merge remote-tracking branch 'origin/dev' into dev 2024-03-03 19:18:40 +08:00
huangxh3 2e2af37d62 同程机票跑通 2024-03-03 19:17:53 +08:00
dengwc d58ecc2db1 Merge remote-tracking branch 'origin/dev' into dev 2024-03-03 19:06:46 +08:00
dengwc 2041982f8c 携程酒店超标测试 2024-03-03 19:06:31 +08:00
huangxh3 1218f2f33b Merge remote-tracking branch 'origin/dev' into dev 2024-03-03 17:59:54 +08:00
huangxh3 7b9ac3b842 同程机票跑通 2024-03-03 17:59:43 +08:00
lulz1 f68bd67cc7 同步代码 2024-03-03 17:25:15 +08:00
lulz1 9179442fbb 同步代码 2024-03-03 16:33:02 +08:00
lulz1 0ab24868e1 Merge remote-tracking branch 'origin/dev' into dev 2024-03-03 16:32:47 +08:00
huangxh3 c5d38eceb6 Merge remote-tracking branch 'origin/dev' into dev 2024-03-03 16:16:51 +08:00
huangxh3 1116b03bb2 同程酒店跑通 2024-03-03 16:16:39 +08:00
lulz1 045a69823e 同步代码 2024-03-03 14:28:48 +08:00
lulz1 046df763a8 同步代码 2024-03-03 13:37:19 +08:00
lulz1 06b7cb786a 同步代码 2024-03-03 13:31:21 +08:00
huangxh3 f7a407c8c9 Merge remote-tracking branch 'origin/dev' into dev 2024-03-03 12:41:53 +08:00
huangxh3 0fe1566b64 日常提交 2024-03-03 12:41:40 +08:00
dengwc 96ce25cdcb Merge remote-tracking branch 'origin/dev' into dev 2024-03-03 12:40:20 +08:00
dengwc 61db171883 BPM流程接口调整 2024-03-03 12:39:55 +08:00
lulz1 c78a7241ee 同步代码 2024-03-03 12:32:09 +08:00
lulz1 3ea36ee924 同步代码 2024-03-03 11:33:49 +08:00
lulz1 9ea8c36ff6 同步代码 2024-03-03 11:27:16 +08:00
lulz1 7c84615666 同步代码 2024-03-03 11:02:53 +08:00
lulz1 2153d24dc8 同步代码 2024-03-03 10:54:51 +08:00
huangxh3 58816d3fb5 Merge remote-tracking branch 'origin/dev' into dev 2024-03-03 09:45:20 +08:00
huangxh3 9c3ee6f5d2 日常提交 2024-03-03 09:44:55 +08:00
wanglf3 38f58a50fa 1.表格数据添加携程数据 2024-03-02 19:28:26 +08:00
dengwc c818afc501 Merge remote-tracking branch 'origin/dev' into dev 2024-03-02 16:04:38 +08:00
dengwc 8c14110a91 BPM流程接口调整 2024-03-02 16:04:10 +08:00
lulz1 5fc2d46236 同步代码 2024-03-02 15:54:07 +08:00
lulz1 25ce2b3b9c 同步代码 2024-03-02 14:49:36 +08:00
dengwc ac730f039d 变更流程代码调整 2024-03-02 13:45:03 +08:00
dengwc ff50758011 变更流程代码调整 2024-03-02 13:12:02 +08:00
dengwc dbf5d8b2d4 新能云枢超标、改签、变更流程代码调整 2024-03-02 10:23:58 +08:00
Superdandan 6b3813fdef 完成地理信息全量的dto 2024-03-01 22:06:11 +08:00
lulz1 a0626e722b 同步代码 2024-03-01 21:19:41 +08:00
dengwc 9109b125e6 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 18:15:58 +08:00
dengwc 040917c413 新能云枢超标、改签、变更流程代码调整 2024-03-01 18:15:46 +08:00
lulz1 e963b3d964 同步代码 2024-03-01 16:55:40 +08:00
lulz1 d9d18e1b27 同步代码 2024-03-01 16:44:23 +08:00
huangxh3 ab41a4abb8 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 16:07:31 +08:00
huangxh3 f7538a1e11 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/chint/interfaces/rest/ly/in/HotelBackController.java
2024-03-01 16:06:58 +08:00
huangxh3 d141719eec 日常提交 2024-03-01 16:05:51 +08:00
lulz1 e8413344fb Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 16:05:48 +08:00
lulz1 2719803aa8 同步代码 2024-03-01 16:01:56 +08:00
wanglf3 e35d335719 1.国际热门城市添加 台北 香港 澳门 2024-03-01 15:47:16 +08:00
lulz1 b7425c7b80 同步代码 2024-03-01 15:11:43 +08:00
lulz1 786abad905 同步代码 2024-03-01 14:48:19 +08:00
lulz1 12f272a395 同步代码 2024-03-01 14:30:36 +08:00
lulz1 7ab0339152 同步代码 2024-03-01 13:21:41 +08:00