 caojia
|
79cc524c03
|
Merge branch 'test'
# Conflicts:
# bms-back/bms-admin/src/main/java/com/bms/web/controller/price/SrvBillAirController.java
# bms-back/bms-system/src/main/java/com/bms/price/airbill/domain/SrvBillAirFee.java
# bms-back/bms-system/src/main/java/com/bms/price/airbill/domain/SrvBillAirFeeLog.java
# bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillMapper.java
# bms-back/bms-system/src/main/java/com/bms/price/mapper/SrvBillAirFeeMapper.java
# bms-back/bms-system/src/main/java/com/bms/price/service/ISrvBillAirFeeService.java
# bms-back/bms-system/src/main/java/com/bms/price/service/impl/SrvBillAirFeeServiceImpl.java
# bms-back/bms-system/src/main/resources/mapper/price/SrvBillAirFeeMapper.xml
# bms-back/sql/price/air_bill_menu.sql
# bms-front/src/api/price/airBill.js
# bms-front/src/views/price/billing/airBill.vue
# bms-front/src/views/price/billing/components/AirBillFeeDialog.vue
# bms-front/src/views/price/billing/components/BillDetail.vue
|
2026-11-10 17:46:55 +08:00 |
|
|
caojia
|
3e5ef25153
|
✨ 完善应收账单毛利分析与提成展示
|
2026-11-10 17:37:17 +08:00 |
|
|
caojia
|
9004a1b921
|
🔥 删除毛利汇总说明文字
|
2026-11-10 17:37:17 +08:00 |
|
|
wuweihua
|
cf6b90008d
|
修改规则
|
2026-11-10 17:30:11 +08:00 |
|
|
liuminghui
|
fbc138f041
|
提单费用均摊处理
|
2026-11-10 17:24:52 +08:00 |
|
|
wuweihua
|
3c49175cea
|
增加规则配置
|
2026-11-10 17:15:38 +08:00 |
|
|
wuweihua
|
f26e03efb1
|
Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
|
2026-11-10 16:21:16 +08:00 |
|
|
wuweihua
|
1a0483c7fe
|
增加一个渠道绑定
|
2026-11-10 16:21:07 +08:00 |
|
|
liuminghui
|
da9efc422e
|
提单费用调整
|
2026-11-10 15:21:03 +08:00 |
|
|
wuweihua
|
e6a9fcf0a2
|
修改类型
|
2026-11-10 14:38:38 +08:00 |
|
|
wuweihua
|
de5784cbac
|
修改打单计费逻辑
|
2026-11-09 23:38:07 +08:00 |
|
|
wuweihua
|
16afa0d590
|
增加一个打单功能套餐
|
2026-11-09 23:00:48 +08:00 |
|
|
wuweihua
|
2632e5aa78
|
渠道管理增加应收关联
|
2026-11-09 17:27:21 +08:00 |
|
|
liuminghui
|
ace1eb06c0
|
去除计费列表的多余按钮
|
2026-11-09 16:15:55 +08:00 |
|
|
liuminghui
|
f31bb4c54d
|
Merge remote-tracking branch 'origin/test' into test
|
2026-11-09 16:00:23 +08:00 |
|
|
liuminghui
|
b8b943ef51
|
偏远地区邮编判断调整
|
2026-11-09 15:58:27 +08:00 |
|
|
caojia
|
f2d27f3502
|
🔥 移除应收毛利分析冗余展示和筛选
|
2026-11-09 15:58:14 +08:00 |
|
|
liuminghui
|
9220696519
|
Merge branch 'test' into feauture-20261104
# Conflicts:
# bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillMapper.java
|
2026-11-09 15:37:55 +08:00 |
|
|
wuweihua
|
efc7ecbd01
|
增加计费日志显示
|
2026-11-09 14:26:37 +08:00 |
|
|
wuweihua
|
b8bbf36767
|
修改删除逻辑
|
2026-11-09 14:26:36 +08:00 |
|
|
wuweihua
|
8633019788
|
增加计费日志显示
|
2026-11-09 14:12:21 +08:00 |
|
|
wuweihua
|
4148c447fc
|
修改删除逻辑
|
2026-11-09 13:39:14 +08:00 |
|
|
wuweihua
|
92cb19fbea
|
合并套餐
|
2026-11-09 11:45:35 +08:00 |
|
|
wuweihua
|
4cb82ec107
|
修改去空格
|
2026-11-09 11:45:33 +08:00 |
|
|
liuminghui
|
e0dc755ee3
|
新增提单费用和费用日志
|
2026-11-09 11:45:27 +08:00 |
|
|
wuweihua
|
6a02de8069
|
增加计费列表收货时间查询
|
2026-11-09 11:45:26 +08:00 |
|
|
wuweihua
|
974f12429a
|
回退代码去掉收货查询
|
2026-11-09 11:45:25 +08:00 |
|
|
wuweihua
|
e06f07b3dd
|
去掉监控的价格日志
|
2026-11-09 11:45:24 +08:00 |
|
|
wuweihua
|
956fb08bea
|
增加价格变更日志
|
2026-11-09 11:45:23 +08:00 |
|
|
wuweihua
|
8d34f84cbb
|
增加版本号显示
|
2026-11-09 11:45:22 +08:00 |
|
|
wuweihua
|
b9cdb6c3f9
|
增加查看计费历史记录
|
2026-11-09 11:45:20 +08:00 |
|
|
wuweihua
|
f57af555ea
|
增加查看价格套餐历史版本的变更
|
2026-11-09 11:45:20 +08:00 |
|
|
caojia
|
220b01127b
|
调整模板
|
2026-11-09 11:29:34 +08:00 |
|
|
caojia
|
aa61dc2d1c
|
🐛 修正账单预览导出重量精度
|
2026-11-09 11:29:34 +08:00 |
|
|
caojia
|
86ed86fc68
|
🐛 修正账单预览重量精度显示
|
2026-11-09 11:29:33 +08:00 |
|
|
caojia
|
61099b2514
|
调整模板
|
2026-11-09 11:24:27 +08:00 |
|
|
caojia
|
9e3f8314f1
|
🐛 修正账单预览导出重量精度
|
2026-11-09 11:24:26 +08:00 |
|
|
caojia
|
7abb7fdb06
|
🐛 修正账单预览重量精度显示
|
2026-11-09 11:24:26 +08:00 |
|
|
caojia
|
cd25055159
|
✨ 新增应收账单毛利分析与提成管理
|
2026-11-09 11:24:26 +08:00 |
|
|
wuweihua
|
489f99dc7b
|
合并套餐
|
2026-11-09 11:09:51 +08:00 |
|
|
wuweihua
|
af3fb0aa2f
|
修改去空格
|
2026-11-06 19:27:31 +08:00 |
|
|
liuminghui
|
e4c16263ab
|
Merge branch 'test' into feauture-20261104
# Conflicts:
# bms-front/src/views/price/billing/components/BillDetail.vue
|
2026-11-06 17:30:48 +08:00 |
|
|
liuminghui
|
020aace3f9
|
新增提单费用和费用日志
|
2026-11-06 17:28:55 +08:00 |
|
|
wuweihua
|
709c315971
|
增加计费列表收货时间查询
|
2026-11-06 16:13:03 +08:00 |
|
|
liuminghui
|
6f342d424f
|
新增路线产品
|
2026-11-06 13:39:26 +08:00 |
|
|
wuweihua
|
a2e986fa6a
|
回退代码去掉收货查询
|
2026-11-06 10:46:58 +08:00 |
|
|
wuweihua
|
7807534e5d
|
去掉监控的价格日志
|
2026-11-06 10:28:55 +08:00 |
|
|
wuweihua
|
e415843b14
|
增加价格变更日志
|
2026-11-06 10:11:15 +08:00 |
|
|
liuminghui
|
b4da248815
|
应付产品增加状态过滤
|
2026-11-06 09:27:49 +08:00 |
|
|
wuweihua
|
1090d838a6
|
增加版本号显示
|
2026-11-05 18:42:27 +08:00 |
|