 Superdandan
|
ee8d1c1372
|
修改差旅申请单同步逻辑
|
2024-04-13 10:49:41 +08:00 |
|
Superdandan
|
3ec2668433
|
修改差旅申请单同步逻辑
|
2024-04-13 10:39:05 +08:00 |
|
Superdandan
|
fe6252d23f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/chint/application/in/RouteRequestController.java
# src/main/java/com/chint/domain/factoriy/order_record/CTripOrderRecordExtensionFactory.java
|
2024-04-13 10:11:28 +08:00 |
lulz1
|
0c7d51fdaa
|
增加供应商供应商品的配置模块和取消规则配置功能
|
2024-04-12 17:34:45 +08:00 |
|
lulz1
|
0183df184b
|
增加供应商供应商品的配置模块和取消规则配置功能
|
2024-04-12 17:32:27 +08:00 |
|
lulz1
|
bf394ab564
|
同步功能添加对已下单的飞机不进行取消同步
|
2024-04-12 09:42:52 +08:00 |
|
lulz1
|
ac4edd598d
|
同步功能添加对已下单的飞机不进行取消同步
|
2024-04-12 09:30:39 +08:00 |
|
lulz1
|
7fdc0f79bf
|
同步功能添加对已下单的飞机不进行取消同步
|
2024-04-12 09:18:56 +08:00 |
|
lulz1
|
af8a7d7a03
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-12 08:30:55 +08:00 |
dengwc
|
def24d3895
|
安能生成环境飞书id和key更换
|
2024-04-12 08:18:57 +08:00 |
|
lulz1
|
9f6971ca07
|
备份route聚合自定义字段
|
2024-04-11 17:39:38 +08:00 |
|
lulz1
|
00c81d4023
|
备份route聚合自定义字段
|
2024-04-11 17:39:04 +08:00 |
|
dengwc
|
f15e1d200b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-11 16:29:11 +08:00 |
|
dengwc
|
eea3524793
|
结算明细字段映射调整
|
2024-04-11 16:28:44 +08:00 |
|
lulz1
|
13b248c9a3
|
开放携程火车差旅申请单同步逻辑
|
2024-04-11 15:44:01 +08:00 |
|
dengwc
|
1ce0b7a4d7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-11 15:07:47 +08:00 |
|
dengwc
|
213e0c9f29
|
结算明细字段映射调整
|
2024-04-11 15:06:21 +08:00 |
|
lulz1
|
1b2eec230d
|
修改查询部门接口逻辑
|
2024-04-11 14:41:29 +08:00 |
|
lulz1
|
ba5ed7fe1d
|
添加部门查询接口
|
2024-04-11 14:35:13 +08:00 |
|
lulz1
|
a39f3e50af
|
结算接口查询条件修改
|
2024-04-11 08:28:42 +08:00 |
|
dengwc
|
94c52aabce
|
结算明细字段映射调整
|
2024-04-11 08:11:26 +08:00 |
|
lulz1
|
3d1435751f
|
结算接口查询条件修改
|
2024-04-10 17:59:13 +08:00 |
|
lulz1
|
f2792bcf86
|
延长token有效时间到3小时
|
2024-04-10 17:00:18 +08:00 |
|
lulz1
|
db38a244e7
|
修复jwt返回结果
|
2024-04-10 16:47:04 +08:00 |
|
lulz1
|
616e43cce6
|
修改结算接口的查询逻辑 ，支持多条件筛选
|
2024-04-10 16:22:25 +08:00 |
|
lulz1
|
a33af30491
|
备份测试
|
2024-04-10 14:48:46 +08:00 |
|
lulz1
|
e8b769ac4e
|
备份测试
|
2024-04-10 14:45:14 +08:00 |
|
lulz1
|
51e62318b2
|
结算数据归属部门添加"无系统标识"
|
2024-04-10 08:49:44 +08:00 |
|
lulz1
|
11d7e939b4
|
修复差旅申请单获取供应商信息出现的bug
|
2024-04-09 16:57:07 +08:00 |
|
lulz1
|
13678aea14
|
修改查询已同步行程节点的接口查询逻辑
|
2024-04-09 16:13:41 +08:00 |
|
lulz1
|
7269918196
|
修改查询已同步行程节点的接口查询逻辑
|
2024-04-09 15:53:11 +08:00 |
|
lulz1
|
fabe98f053
|
修改查询已同步行程节点的接口查询逻辑
|
2024-04-09 15:15:17 +08:00 |
|
lulz1
|
7c76883246
|
修改查询已同步行程节点的接口查询逻辑
|
2024-04-09 15:07:36 +08:00 |
|
lulz1
|
d727db4da5
|
修改查询已同步行程节点的接口查询逻辑
|
2024-04-09 14:55:59 +08:00 |
|
lulz1
|
e1da20af91
|
修改查询已同步行程节点的接口查询逻辑
|
2024-04-09 14:47:55 +08:00 |
|
lulz1
|
7fd737cb8d
|
修改查询已同步行程节点的接口查询逻辑
|
2024-04-09 14:40:44 +08:00 |
|
lulz1
|
da11ca1290
|
修改结算数据的分页拉取的排序方式
|
2024-04-09 14:16:52 +08:00 |
|
lulz1
|
c98af507f9
|
修复查询同步行程节点添加出行人字段
|
2024-04-09 14:03:41 +08:00 |
|
lulz1
|
33003e39db
|
修复查询同步行程节点缺少部分英文字段的问题
|
2024-04-09 13:48:52 +08:00 |
|
dengwc
|
661dafb8b8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-09 13:24:39 +08:00 |
|
dengwc
|
569ff0becb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-09 13:22:58 +08:00 |
|
lulz1
|
9489e52f06
|
修改同程推送逻辑
|
2024-04-09 13:22:49 +08:00 |
|
dengwc
|
981bb48f7d
|
结算明细字段映射调整
|
2024-04-09 13:22:42 +08:00 |
|
lulz1
|
2005e023a8
|
修复当不传行程节点参数的时候，默认为全部行程节点
|
2024-04-09 12:59:20 +08:00 |
|
lulz1
|
b33224b5f6
|
修复查询未同步行程节点， 地点信息缺失的问题
|
2024-04-09 12:49:44 +08:00 |
|
lulz1
|
2095abd91b
|
修复筛选打车转换res格式的bug
|
2024-04-09 12:39:55 +08:00 |
|
lulz1
|
16fd3c32c1
|
增加已同步行程筛选功能
|
2024-04-09 10:41:30 +08:00 |
|
lulz1
|
e98af60faa
|
备份同步差旅申请的代码
|
2024-04-09 09:54:41 +08:00 |
|
Superdandan
|
ba6c824fd0
|
备份
|
2024-04-08 22:21:31 +08:00 |
|
lulz1
|
6768db0cdc
|
备份同步差旅申请的代码
|
2024-04-08 22:11:10 +08:00 |