Commit Graph

1017 Commits

Author SHA1 Message Date
cabbage c6d84ee89c Merge remote-tracking branch 'origin/dev' into dev 2025-09-30 11:15:38 +08:00
cabbage d00a36b698 ## 奖衔升级处理方式优化; 2025-09-30 11:15:31 +08:00
zhangheng ea80a5cac5 ## 订单开票枚举替换 2025-09-30 10:55:38 +08:00
zhangheng 461c25bf42 ## 订单开票枚举替换 2025-09-30 10:55:25 +08:00
zhangheng 1174abd26a ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 10:39:40 +08:00
zhangheng 4f168e9a14 ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 10:39:02 +08:00
zhangheng 9ea951c736 ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 09:44:33 +08:00
zhangheng 715f7ed3dc ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 09:44:20 +08:00
zhangheng 5f4a6b8698 ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 09:43:26 +08:00
zhangheng 5b169701a0 ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 09:43:04 +08:00
cabbage a4e8f8f8c6 ## 奖衔计算方式改为先算奖衔;赠点排点方式问题修复; 2025-09-29 18:02:25 +08:00
cabbage 83136f1387 ## 奖衔计算方式改为先算奖衔;赠点排点方式问题修复; 2025-09-29 18:01:35 +08:00
sangelxiu1 8b5d7a5f9d ## Opt - 手机端奖金明细 2025-09-29 15:23:02 +08:00
sangelxiu1 6e92c3025b Merge remote-tracking branch 'origin/test' into test 2025-09-29 15:22:37 +08:00
sangelxiu1 aee06c0ef7 ## Opt - 手机端奖金明细 2025-09-29 15:22:31 +08:00
zhangheng 3f2b414337 ## bug427 会员信息查询空数据返回成功 2025-09-29 15:22:17 +08:00
zhangheng 5d1ddc2abc ## bug427 会员信息查询空数据返回成功 2025-09-29 15:21:47 +08:00
sangelxiu1 a3aee14a0e ## Opt - 手机端奖金明细 2025-09-29 15:18:17 +08:00
sangelxiu1 5ad816c449 ## Opt - 手机端奖金明细 2025-09-29 15:17:57 +08:00
cabbage 15dba62617 ## 赠送点位处理; 2025-09-29 14:32:55 +08:00
cabbage f388e583f1 ## 去掉原来不需要MQ推送;奖金明细、奖金来源; 2025-09-29 14:32:54 +08:00
cabbage 9cd8bc45f5 ## 赠送点位处理; 2025-09-29 14:31:14 +08:00
cabbage eb1c954894 Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 14:02:33 +08:00
cabbage d9ab4c8346 ## 去掉原来不需要MQ推送;奖金明细、奖金来源; 2025-09-29 14:02:29 +08:00
sangelxiu1 06a9ada5a6 ## Opt - 五折专区 2025-09-29 13:59:11 +08:00
sangelxiu1 793429a502 Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 13:58:52 +08:00
sangelxiu1 c11c8be339 ## Opt - 五折专区 2025-09-29 13:58:45 +08:00
cabbage 27fcffa5ca ## 奖衔升级处理; 2025-09-29 13:46:55 +08:00
cabbage 2d683d0a58 ## 调整奖金入库; 2025-09-29 13:46:54 +08:00
cabbage ad42a04afa ## 奖衔升级处理; 2025-09-29 13:46:36 +08:00
cabbage 65f23cae4c ## 调整奖金入库; 2025-09-29 12:00:09 +08:00
cabbage c2dce5274c ## 奖衔计算,直推会员判断大小区使用团队业绩+个人业绩; 2025-09-29 11:33:58 +08:00
cabbage d197689a19 ## 奖衔计算,直推会员判断大小区使用团队业绩+个人业绩; 2025-09-29 11:33:20 +08:00
sangelxiu1 b1c1ec9074 ## Opt - 业绩统计细化 2025-09-29 11:08:40 +08:00
sangelxiu1 1e6cc04057 ## Opt - 业绩统计细化 2025-09-29 11:08:26 +08:00
sangelxiu1 7e23a37798 Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 11:01:34 +08:00
sangelxiu1 866b52a99a ## Opt - 业绩统计细化 2025-09-29 11:01:25 +08:00
sangelxiu1 1a477878c9 Merge remote-tracking branch 'origin/test' into test 2025-09-29 11:00:53 +08:00
sangelxiu1 ddf974e33c ## Opt - 业绩统计细化 2025-09-29 11:00:45 +08:00
cabbage 883be1c8a7 ## 奖金来源添加领导奖、平级奖筛选; 2025-09-29 10:55:00 +08:00
cabbage 3e7c57c2a0 ## 奖金来源添加领导奖、平级奖筛选; 2025-09-29 10:55:00 +08:00
cabbage d74ccdb898 ## 奖金来源添加领导奖、平级奖筛选; 2025-09-29 10:54:44 +08:00
cabbage c9da1f307c ## 奖金来源添加领导奖、平级奖筛选; 2025-09-29 10:27:14 +08:00
cabbage f5584a64c7 ## 领导奖、平级奖计算; 2025-09-29 10:15:18 +08:00
cabbage 158751fc38 Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 10:15:00 +08:00
cabbage 6ff4fd3c1a ## 领导奖、平级奖计算; 2025-09-29 10:14:48 +08:00
sangelxiu1 a1e7a85fc5 ## Opt - 商品详情,42强转41 2025-09-29 09:53:22 +08:00
sangelxiu1 0797ca19c7 ## Opt - 商品详情,42强转41 2025-09-29 09:46:30 +08:00
sangelxiu1 878cbbe65d ## Fix - 甄选专区的订单撤单失败[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=423] 2025-09-29 09:41:02 +08:00
sangelxiu1 b1e6f3cc53 Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 09:40:00 +08:00