Commit Graph
41 Commits
Author SHA1 Message Date
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 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 a4a03a8ae8 优化 2026-08-07 15:19:21 +08:00
ouyangxq b0ea1a0c5c 优化 2026-08-07 14:46:55 +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 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
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 5f8b1f64da 优化 2026-08-06 15:32:11 +08:00
ouyangxq f3cfbdf59b 优化 2026-08-06 14:55:24 +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 5ba9716e12 优化 2026-08-05 16:26:10 +08:00
liuyihe 06f7f9d2f2 日志记录提交 2026-08-05 14:20:04 +08:00
liuyihe cac377de96 新增海外仓阶梯费用 2026-08-05 11:20:28 +08:00
liuyihe 9678ee0f1f 删除增量文件 2026-08-05 10:54:38 +08:00
liuyihe 496fc58a90 格式修改 2026-08-05 10:35:07 +08:00
ouyangxq 81c9c92f5d 优化 2026-08-05 09:30:08 +08:00
liuyihe 917f217088 二期内容提交 2026-08-04 20:13:56 +08:00
liuyihe e20d20c540 二期内容提交 2026-08-04 20:13:40 +08:00
liuyihe 3292f2c597 二期内容提交 2026-08-04 17:29:36 +08:00
liuyihe b7d36d4766 二期内容提交 2026-08-04 17:18:07 +08:00
liuyihe 7e945229be Merge remote-tracking branch 'origin/test' into test-01
# Conflicts:
#	config/nacos/cn/file-service.yml
#	config/nacos/local/file-service.yml
#	deploy/sql/README.md
#	firstleg/pom.xml
2026-08-04 12:27:25 +08:00
liuyihe addde4375e 二期内容提交 2026-08-04 12:23:46 +08:00
liuyihe 25d2a13581 二期内容提交 2026-08-04 10:24:43 +08:00
liuyihe 57b54a5236 二期内容提交 2026-08-04 10:07:45 +08:00
ouyangxq 3afcff320a 优化 2026-08-04 09:05:28 +08:00
ouyangxq fdb1e8af1c 优化 2026-08-03 18:28:35 +08:00
liuyihe b2b4ff429d 暂存 2026-08-03 17:26:59 +08:00
liuyihe dc02c7a62d 暂存提交 2026-08-03 12:43:30 +08:00