Commit Graph

745 Commits

Author SHA1 Message Date
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
huangxh3 86e3b21554 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 10:51:59 +08:00
huangxh3 8e0830d588 日常提交 2024-03-01 10:51:21 +08:00
dengwc 79dc530024 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 10:50:15 +08:00
dengwc c8290fd7d9 新能云枢超标、改签流程代码调整 2024-03-01 10:49:46 +08:00
lulz1 42174e9bce 同步代码 2024-03-01 10:33:39 +08:00
lulz1 914a4cd959 同步代码 2024-03-01 10:25:18 +08:00
lulz1 99bd01fe7b 同步代码 2024-03-01 09:34:00 +08:00
lulz1 8aeb194824 同步代码 2024-03-01 09:19:31 +08:00
lulz1 1de351fa10 暂时注释新能jar包 2024-03-01 08:38:41 +08:00
lulz1 7500ba4854 同步代码 2024-03-01 08:21:42 +08:00
huangxh3 b54129e9e0 日常提交,数据回推 2024-02-29 18:04:27 +08:00
dengwc b8c94cf1b5 新能云枢超标、改签流程调用测试编写 2024-02-29 17:48:15 +08:00
dengwc 45a12474e1 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pom.xml
2024-02-29 17:25:08 +08:00
dengwc 48888e5e49 新能云枢超标、改签流程调用测试编写 2024-02-29 17:24:14 +08:00
wanglf3 cdad882e06 1.修改订单明细添加字段区分商品类型 2024-02-29 16:53:46 +08:00
lulz1 69a42c9b5e 同步代码 2024-02-29 15:47:59 +08:00
lulz1 bae2199a7a 同步代码 2024-02-29 15:33:39 +08:00
wanglf3 5f6a7103f7 1.热门城市列表信息添加国际热门城市信息。 2024-02-29 15:20:13 +08:00
lulz1 faf24581d9 同步代码 2024-02-29 13:32:38 +08:00
lulz1 e4ba73bbf1 同步代码 2024-02-29 13:32:13 +08:00
lulz1 ee0abe3fbf 同步代码 2024-02-29 13:27:31 +08:00
wanglf3 71a44f4588 1.添加获取热门城市接口 2024-02-29 13:26:39 +08:00
wanglf3 e16271e519 1.添加获取热门城市接口 2024-02-29 13:24:14 +08:00
wanglf3 6abb2643a9 1.添加获取热门城市接口 2024-02-29 13:22:51 +08:00