Commit Graph

983 Commits

Author SHA1 Message Date
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
sangelxiu1 6e730f5da1 ## Fix - 甄选专区的订单撤单失败[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=423] 2025-09-29 09:39:53 +08:00
zhangheng 7f6ac2347a ## bug421 查询表名修改,查询错误返回错误信息 2025-09-29 09:26:16 +08:00
zhangheng 072ba08f67 ## bug421 查询表名修改,查询错误返回错误信息 2025-09-29 09:26:02 +08:00
zhangheng c21f641973 ## bug421 查询表名修改 2025-09-29 09:08:57 +08:00
zhangheng 408aa89cc2 ## bug421 查询表名修改 2025-09-29 09:08:21 +08:00
cabbage 4ec7863084 ## 领导奖、平级奖计算; 2025-09-28 18:03:47 +08:00
cabbage cf973fd5b9 ## 领导奖、平级奖计算; 2025-09-28 18:03:21 +08:00
zhangheng a2a828d71a ## 阶段配置考核奖衔返回值修改 2025-09-28 17:53:31 +08:00
zhangheng cd4a09d35d ## 阶段配置考核奖衔返回值修改 2025-09-28 17:53:07 +08:00
zhangheng 6ded77fea8 ## 架构修改,阶段配置修改,子节点排序,会员子节点添加未完成数量 2025-09-28 17:24:35 +08:00
zhangheng 5e0fecd8b9 ## 架构修改,阶段配置修改,子节点排序,会员子节点添加未完成数量 2025-09-28 17:23:54 +08:00
cabbage 0378dd3d50 ## 日结奖衔计算处理; 2025-09-28 15:52:10 +08:00
cabbage 290793236a ## 日结奖衔计算处理; 2025-09-28 15:51:45 +08:00
sangelxiu1 5ca7df77ee ## Opt - 等级翻译 2025-09-28 15:27:34 +08:00
sangelxiu1 3626b3f4cc ## Opt - 等级翻译 2025-09-28 15:27:23 +08:00
sangelxiu1 50c9fc0a1d ## Opt - 市场动态 2025-09-28 14:11:20 +08:00
cabbage 1fc421a74d ## 奖衔实体调整; 2025-09-28 14:03:34 +08:00
cabbage 6704bace80 ## 奖衔实体调整; 2025-09-28 14:03:34 +08:00
cabbage 5c8c950931 ## 奖衔实体调整; 2025-09-28 13:59:49 +08:00
cabbage 75d68a34d8 ## 奖衔实体调整; 2025-09-28 13:59:17 +08:00
sangelxiu1 6442f2bbfb ## Opt - 市场动态-取消自己虚拟区&取消计算个人业绩 2025-09-28 13:40:40 +08:00
sangelxiu1 d60a2f2be4 ## Opt - 市场动态-取消自己虚拟区&取消计算个人业绩 2025-09-28 13:40:07 +08:00
sangelxiu1 975665c548 Merge remote-tracking branch 'origin/dev' into dev 2025-09-28 12:22:59 +08:00
sangelxiu1 215106c4ac ## Opt - 市场动态 2025-09-28 12:22:51 +08:00
cabbage e5c1287d22 ## 结算新字段兼容; 2025-09-28 11:32:20 +08:00
cabbage 4c27a9f9f1 Merge remote-tracking branch 'origin/dev' into dev 2025-09-28 11:31:36 +08:00
cabbage 9258dbb4e1 ## 结算新字段兼容; 2025-09-28 11:31:25 +08:00
sangelxiu1 0a018f5539 ## Opt - 市场动态 2025-09-28 11:12:56 +08:00
sangelxiu1 3b5a79806f Merge remote-tracking branch 'origin/test' into test 2025-09-28 11:12:38 +08:00
sangelxiu1 994b670493 ## Opt - 市场动态 2025-09-28 11:12:29 +08:00
zhangheng 7374400936 ## 前台返回提示修改 2025-09-28 10:04:27 +08:00
zhangheng 18f138caf1 ## 前台返回提示修改 2025-09-28 09:28:28 +08:00
cabbage f336435346 ## 日结处理业绩; 2025-09-28 09:06:00 +08:00
cabbage a2e0c521aa ## 日结处理业绩; 2025-09-28 09:04:49 +08:00