Commit Graph
145 Commits
Author SHA1 Message Date
ouyangxq 2779bf9ff7 修复客户尺寸加权与入库计费验收 2026-08-08 09:43:56 +08:00
ouyangxq f3c2bafec8 Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test 2026-08-08 09:17:44 +08:00
ouyangxq 5951e6aa68 优化 2026-08-08 09:17:42 +08:00
liuyihe 0d70edc020 Merge branch 'test-02huogui' into test
# Conflicts:
#	firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java
#	firstleg/src/test/java/com/baiyue/firstleg/service/InboundMeasurementServiceTest.java
2026-08-07 23:46:44 +08:00
liuyihe a09639ff05 暂存提交 2026-08-07 23:43:41 +08:00
ouyangxq 4a6f976a91 优化 2026-08-07 20:08:13 +08:00
ouyangxq c4b0972dc9 优化 2026-08-07 20:07:30 +08:00
liuyihe 2b81fd40e7 Merge branch 'test' into test-02huogui
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
#	firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java
#	firstleg/src/main/resources/application.yml
#	firstleg/src/main/resources/openapi/fba-pricing-v1.yaml
#	firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java
#	order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java
#	order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java
2026-08-07 19:49:09 +08:00
liuyihe 3f15f3ad2b 暂存提交 2026-08-07 19:40:42 +08:00
ouyangxq c698290106 优化 2026-08-07 19:23:40 +08:00
ouyangxq 37fec1e012 优化 2026-08-07 18:44:51 +08:00
ouyangxq 1a76602872 优化 2026-08-07 18:03:56 +08:00
ouyangxq 645c483649 优化 2026-08-07 17:46:23 +08:00
ouyangxq 98ac9840c2 优化 2026-08-07 17:36:02 +08:00
ouyangxq 91f31d9567 优化 2026-08-07 17:14:40 +08:00
ouyangxq f4c3a95772 优化 2026-08-07 16:16:59 +08:00
ouyangxq ba5bad4429 优化 2026-08-07 16:02:42 +08:00
ouyangxq 3f597677fe 优化 2026-08-07 15:53:55 +08:00
liuyihe 7c17b1a76a 订单批量审核提交 2026-08-07 15:32:59 +08:00
ouyangxq a4a03a8ae8 优化 2026-08-07 15:19:21 +08:00
liuyihe 77dc32a69a 订单批量审核提交 2026-08-07 14:52:21 +08:00
ouyangxq b0ea1a0c5c 优化 2026-08-07 14:46:55 +08:00
liuyihe 0dc60d835b 装柜 2026-08-07 12:19:47 +08:00
liuyihe efb01f8932 Merge branch 'test' into test-02huogui
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
#	firstleg/src/main/java/com/baiyue/firstleg/BaiyueFirstlegApplication.java
#	firstleg/src/main/resources/openapi/firstleg-v1.yaml
2026-08-07 11:11:43 +08:00
liuyihe ebea3a1813 装柜 2026-08-07 10:57:06 +08:00
ouyangxq 830575cc92 优化 2026-08-07 10:45:09 +08:00
ouyangxq 897f91af20 优化 2026-08-07 09:06:19 +08:00
ouyangxq a5dc0f78c3 优化 2026-08-06 19:21:09 +08:00
ouyangxq 6964e3afa3 优化 2026-08-06 19:03:09 +08:00
ouyangxq 74db8e165d 优化 2026-08-06 18:34:52 +08:00
ouyangxq d2e3fef8f8 优化 2026-08-06 18:14:29 +08:00
ouyangxq 6e9739826c 优化 2026-08-06 18:01:59 +08:00
liuyihe 913eca7b7d 装柜 2026-08-06 17:48:50 +08:00
ouyangxq 584f1519d1 优化 2026-08-06 16:58:33 +08:00
ouyangxq 63eefd280b 优化 2026-08-06 16:17:16 +08:00
liuyihe c68eedd3f3 Merge branch 'test' into test-02huogui
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
2026-08-06 15:54:25 +08:00
liuyihe c3a978b497 提交 2026-08-06 15:48:21 +08:00
ouyangxq 9c4bae9f5c 优化 2026-08-06 15:43:35 +08:00
ouyangxq 3ecb8d7613 优化 2026-08-06 15:36:23 +08:00
ouyangxq 5f8b1f64da 优化 2026-08-06 15:32:11 +08:00
ouyangxq f3cfbdf59b 优化 2026-08-06 14:55:24 +08:00
ouyangxq dca3a48284 优化 2026-08-06 13:56:20 +08:00
ouyangxq e6604ed680 Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test 2026-08-06 11:49:53 +08:00
ouyangxq 7dd92f1c84 优化 2026-08-06 11:49:51 +08:00
liuyihe 4df8b8c355 客户运费计费 2026-08-05 20:32:43 +08:00
ouyangxq a11e47fe3b 1 2026-08-05 18:02:56 +08:00
ouyangxq 5ba9716e12 优化 2026-08-05 16:26:10 +08:00
liuyihe 06f7f9d2f2 日志记录提交 2026-08-05 14:20:04 +08:00
ouyangxq 264458920b 优化 2026-08-05 13:50:37 +08:00
ouyangxq 487f398eb8 Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test 2026-08-05 11:46:07 +08:00