cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								c9da1f307c
								
							
						 | 
						
							
							
								
								## 奖金来源添加领导奖、平级奖筛选;
							
							
							
							
							
						 | 
						
							2025-09-29 10:27:14 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								0797ca19c7
								
							
						 | 
						
							
							
								
								## Opt - 商品详情,42强转41
							
							
							
							
							
						 | 
						
							2025-09-29 09:46:30 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								072ba08f67
								
							
						 | 
						
							
							
								
								## bug421 查询表名修改,查询错误返回错误信息
							
							
							
							
							
						 | 
						
							2025-09-29 09:26:02 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								408aa89cc2
								
							
						 | 
						
							
							
								
								## bug421 查询表名修改
							
							
							
							
							
						 | 
						
							2025-09-29 09:08:21 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								cf973fd5b9
								
							
						 | 
						
							
							
								
								## 领导奖、平级奖计算;
							
							
							
							
							
						 | 
						
							2025-09-28 18:03:21 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								cd4a09d35d
								
							
						 | 
						
							
							
								
								## 阶段配置考核奖衔返回值修改
							
							
							
							
							
						 | 
						
							2025-09-28 17:53:07 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								5e0fecd8b9
								
							
						 | 
						
							
							
								
								## 架构修改,阶段配置修改,子节点排序,会员子节点添加未完成数量
							
							
							
							
							
						 | 
						
							2025-09-28 17:23:54 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								290793236a
								
							
						 | 
						
							
							
								
								## 日结奖衔计算处理;
							
							
							
							
							
						 | 
						
							2025-09-28 15:51:45 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								3626b3f4cc
								
							
						 | 
						
							
							
								
								## Opt - 等级翻译
							
							
							
							
							
						 | 
						
							2025-09-28 15:27:23 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								5c8c950931
								
							
						 | 
						
							
							
								
								## 奖衔实体调整;
							
							
							
							
							
						 | 
						
							2025-09-28 13:59:49 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								75d68a34d8
								
							
						 | 
						
							
							
								
								## 奖衔实体调整;
							
							
							
							
							
						 | 
						
							2025-09-28 13:59:17 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								18f138caf1
								
							
						 | 
						
							
							
								
								## 前台返回提示修改
							
							
							
							
							
						 | 
						
							2025-09-28 09:28:28 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a2e0c521aa
								
							
						 | 
						
							
							
								
								## 日结处理业绩;
							
							
							
							
							
						 | 
						
							2025-09-28 09:04:49 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								1595f11723
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-09-26 17:54:37 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								bc0f51446f
								
							
						 | 
						
							
							
								
								## 日结处理业绩;
							
							
							
							
							
						 | 
						
							2025-09-26 17:54:28 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								e1da81afaa
								
							
						 | 
						
							
							
								
								## 导出请求修改
							
							
							
							
							
						 | 
						
							2025-09-26 17:48:47 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								89583fe096
								
							
						 | 
						
							
							
								
								## 导出请求值修改
							
							
							
							
							
						 | 
						
							2025-09-26 17:37:35 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								5ab49626cf
								
							
						 | 
						
							
							
								
								## bug419 导出接收字段修改
							
							
							
							
							
						 | 
						
							2025-09-26 17:17:20 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								caae0a9d5c
								
							
						 | 
						
							
							
								
								## 导出修改,会员子点信息排序
							
							
							
							
							
						 | 
						
							2025-09-26 17:00:22 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								5ade87a91d
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-09-26 16:45:32 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								301648f213
								
							
						 | 
						
							
							
								
								## Opt - 秒结-甄选数据算在注册专区
							
							
							
							
							
						 | 
						
							2025-09-26 16:45:25 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								110cef3674
								
							
						 | 
						
							
							
								
								## 会员点位信息排序查询
							
							
							
							
							
						 | 
						
							2025-09-26 16:39:18 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								ac43ec5553
								
							
						 | 
						
							
							
								
								## 会员点位信息分页返回值修改
							
							
							
							
							
						 | 
						
							2025-09-26 16:22:54 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								daa9efe4e5
								
							
						 | 
						
							
							
								
								## 分页返回值修改
							
							
							
							
							
						 | 
						
							2025-09-26 16:14:15 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								6832412c6f
								
							
						 | 
						
							
							
								
								## api会员子点信息只传当前会员信息
							
							
							
							
							
						 | 
						
							2025-09-26 16:06:26 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								2fe1c41a92
								
							
						 | 
						
							
							
								
								## 分页返回值修改
							
							
							
							
							
						 | 
						
							2025-09-26 15:41:09 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a99c27a3ff
								
							
						 | 
						
							
							
								
								## 赠点如果直推下没有可以填充的,则按血缘上逻辑走;
							
							
							
							
							
						 | 
						
							2025-09-26 15:19:55 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								9afc8c69cf
								
							
						 | 
						
							
							
								
								## 赠点激活阶段填充处理;
							
							
							
							
							
						 | 
						
							2025-09-26 14:54:47 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								c2cad9d48e
								
							
						 | 
						
							
							
								
								## 会员点位信息为空
							
							
							
							
							
						 | 
						
							2025-09-26 14:09:08 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								8bc857429d
								
							
						 | 
						
							
							
								
								## 会员子点位会员编号非必传
							
							
							
							
							
						 | 
						
							2025-09-26 13:42:46 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								6d94163770
								
							
						 | 
						
							
							
								
								## 会员子点位信息添加导出
							
							
							
							
							
						 | 
						
							2025-09-26 11:43:27 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								d367046cfd
								
							
						 | 
						
							
							
								
								## 三阶段架构列表数据,会员子点位信息
							
							
							
							
							
						 | 
						
							2025-09-26 10:42:55 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								18e62e2d6b
								
							
						 | 
						
							
							
								
								## 三阶段架构列表数据,会员子点位信息
							
							
							
							
							
						 | 
						
							2025-09-26 09:39:54 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								6a14870803
								
							
						 | 
						
							
							
								
								## Opt - 小购物车非空验证
							
							
							
							
							
						 | 
						
							2025-09-26 09:07:15 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								633db7b773
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-09-25 18:07:41 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								737f118daf
								
							
						 | 
						
							
							
								
								## 二三阶段数据补全;
							
							
							
							
							
						 | 
						
							2025-09-25 18:07:36 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								12b98ee6a0
								
							
						 | 
						
							
							
								
								## 三阶段架构列表数据
							
							
							
							
							
						 | 
						
							2025-09-25 15:44:07 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								2d051ef4f5
								
							
						 | 
						
							
							
								
								## Opt - 甄选专区限购单笔限购20000
							
							
							
							
							
						 | 
						
							2025-09-25 15:12:16 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								ce8a8fd222
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-09-25 14:59:09 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								cf3c6a8a9c
								
							
						 | 
						
							
							
								
								## Opt - 奖金来源
							
							
							
							
							
						 | 
						
							2025-09-25 14:59:02 +08:00 |