Commit Graph

129 Commits

Author SHA1 Message Date
18338781771 37167f8c28 Merge branch 'feature/vehicle_new_sku' into develop 2025-07-01 10:21:18 +08:00
18338781771 af17182605 1 2025-07-01 10:21:09 +08:00
18338781771 61219df3d0 Merge branch 'feature/article' into develop
# Conflicts:
#	app/console/service/VehicleNewSkusService.php
2025-07-01 10:02:45 +08:00
18338781771 9d5796c3a9 修改时不翻译 2025-07-01 09:59:36 +08:00
18338781771 2360df3bf6 Merge branch 'feature/article' into develop 2025-07-01 09:07:04 +08:00
18338781771 1a72b2a94e 1 2025-07-01 09:06:55 +08:00
18338781771 e7eecd9b2b Merge branch 'feature/article' into develop 2025-07-01 09:04:28 +08:00
18338781771 ca8e518854 品牌修改 2025-07-01 09:04:12 +08:00
18338781771 47dae69c62 Merge branch 'feature/article' into develop 2025-06-30 16:02:49 +08:00
18338781771 d8c06f6be6 修改时不做翻译 2025-06-30 16:02:41 +08:00
18338781771 26e2f9ab63 1 2025-06-30 16:02:19 +08:00
18338781771 5d0dbbc4ac Merge branch 'feature/article' into develop 2025-06-30 14:48:00 +08:00
18338781771 edbe5ef579 1 2025-06-30 14:47:52 +08:00
18338781771 1a1aa7e3aa Merge branch 'feature/article' into develop 2025-06-30 14:34:36 +08:00
18338781771 73e3e7ab5b 1 2025-06-30 14:34:23 +08:00
18338781771 8cf546100d Merge branch 'feature/article' into develop 2025-06-27 17:28:22 +08:00
18338781771 e5a4df1bc0 1 2025-06-27 17:28:12 +08:00
18338781771 8a1f7b7347 Merge branch 'feature/article' into develop 2025-06-27 17:20:06 +08:00
18338781771 1520a26284 1 2025-06-27 17:20:00 +08:00
18338781771 b5765a25de Merge branch 'feature/article' into develop 2025-06-27 17:15:54 +08:00
18338781771 541ed9a3ec 1 2025-06-27 17:15:47 +08:00
18338781771 5d9ee7098a Merge branch 'feature/article' into develop 2025-06-27 17:04:33 +08:00
18338781771 c8eb5f33ee 1 2025-06-27 17:04:25 +08:00
18338781771 a94224c81e Merge branch 'feature/article' into develop 2025-06-27 15:25:17 +08:00
18338781771 c30ff3cca1 文章 2025-06-27 15:24:58 +08:00
18338781771 32cfaf8e9a Merge branch 'feature/article' into develop 2025-06-27 13:49:22 +08:00
18338781771 8112aa5dec 创建人 2025-06-27 13:48:58 +08:00
18338781771 72b296540a Merge branch 'feature/article' into develop 2025-06-27 11:20:01 +08:00
18338781771 33340cd93d 文章 2025-06-27 11:19:40 +08:00
18338781771 034d2a84f0 Merge branch 'feature/vehicle_new_sku' into develop 2025-06-23 09:23:20 +08:00
18338781771 dc1889fd12 1 2025-06-23 09:23:12 +08:00
18338781771 79d3e59fce Merge branch 'feature/vehicle_new_sku' into develop 2025-06-23 09:19:54 +08:00
18338781771 ba53d10b47 1 2025-06-23 09:19:40 +08:00
18338781771 413ea96a27 Merge branch 'feature/vehicle_new_sku' into develop 2025-06-20 17:33:49 +08:00
18338781771 50f69c5efa 1 2025-06-20 17:33:44 +08:00
18338781771 ad84e0d4ea Merge branch 'feature/vehicle_new_sku' into develop 2025-06-20 17:32:16 +08:00
18338781771 8233a88bc7 sku中属性值不能重复 2025-06-20 17:32:03 +08:00
18338781771 1d9fbdb3a2 Merge branch 'feature/vehicle_new_sku' into develop 2025-06-20 17:22:11 +08:00
18338781771 294f0b62c7 1 2025-06-20 17:22:01 +08:00
18338781771 dbca53f7d8 Merge branch 'feature/vehicle_new_sku' into develop 2025-06-20 16:47:09 +08:00
18338781771 af46fb9f46 1 2025-06-20 16:47:02 +08:00
18338781771 9410d36145 Merge branch 'feature/vehicle_new_sku' into develop 2025-06-20 16:05:18 +08:00
18338781771 a136473171 1 2025-06-20 16:05:04 +08:00
18338781771 2dbf422805 Merge branch 'feature/vehicle_new_sku' into develop 2025-06-20 15:15:48 +08:00
18338781771 6cf0831c3e 1 2025-06-20 15:15:40 +08:00
18338781771 1fde0ad4eb Merge branch 'feature/vehicle_new_sku' into develop 2025-06-20 15:07:51 +08:00
18338781771 26d3d7d115 1 2025-06-20 15:07:42 +08:00
18338781771 af63d438e1 Merge branch 'feature/vehicle_new_sku' into develop 2025-06-20 14:52:46 +08:00
18338781771 d8eb7efff2 1 2025-06-20 14:52:39 +08:00
18338781771 e927e22050 Merge branch 'feature/vehicle_new_sku' into develop 2025-06-20 11:48:45 +08:00