zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								b4fe208d58
								
							
						 | 
						
							
							
								
								## 架构树调整(添加阶段顺序)
							
							
							
							
							
						 | 
						
							2025-10-23 16:03:54 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e0d2fb7a7a
								
							
						 | 
						
							
							
								
								## 二三阶段添加阶段顺序;
							
							
							
							
							
						 | 
						
							2025-10-23 16:03:53 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								8a9e681b46
								
							
						 | 
						
							
							
								
								## 二三阶段添加阶段顺序;
							
							
							
							
							
						 | 
						
							2025-10-23 16:03:52 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								0a38b48a68
								
							
						 | 
						
							
							
								
								## 打印奖金结算完成时间;
							
							
							
							
							
						 | 
						
							2025-10-23 10:09:18 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								9bf4563f94
								
							
						 | 
						
							
							
								
								## 前台阶段架构修改
							
							
							
							
							
						 | 
						
							2025-10-22 18:00:44 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								55dfdbe7c2
								
							
						 | 
						
							
							
								
								## 看板复购数据包含五折专区;
							
							
							
							
							
						 | 
						
							2025-10-22 17:53:34 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								2326c9d9d9
								
							
						 | 
						
							
							
								
								## 定时任务判断调用是否成功判断方式修改;
							
							
							
							
							
						 | 
						
							2025-10-22 17:14:29 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								e5568ca043
								
							
						 | 
						
							
							
								
								## 前台架构树查询
							
							
							
							
							
						 | 
						
							2025-10-22 16:15:06 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								caa8f7278b
								
							
						 | 
						
							
							
								
								## 一阶段点位创建时间为订单时间;二三阶段为实时;
							
							
							
							
							
						 | 
						
							2025-10-22 14:54:15 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								1d7e51a2f1
								
							
						 | 
						
							
							
								
								## 会员子点位分页
							
							
							
							
							
						 | 
						
							2025-10-21 11:06:08 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								75424113f2
								
							
						 | 
						
							
							
								
								## 会员子点位分页
							
							
							
							
							
						 | 
						
							2025-10-21 09:43:22 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								d50e54abc6
								
							
						 | 
						
							
							
								
								## Opt - 分享商品列表 增加查询条件(商品名/商品类别)
							
							
							
							
							
						 | 
						
							2025-10-16 14:22:31 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								265445daea
								
							
						 | 
						
							
							
								
								## Opt - 分享商品列表 增加查询条件(商品名/商品类别)
							
							
							
							
							
						 | 
						
							2025-10-15 16:57:23 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								10c8e1c47d
								
							
						 | 
						
							
							
								
								## Opt - 分享商品列表 增加查询条件(商品名/商品类别)
							
							
							
							
							
						 | 
						
							2025-10-15 15:37:08 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								e9636f048a
								
							
						 | 
						
							
							
								
								## Opt - 分享商品列表 增加查询条件(商品名/商品类别)
							
							
							
							
							
						 | 
						
							2025-10-15 15:19:27 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a70da868d4
								
							
						 | 
						
							
							
								
								## 甄选专区改为复购专区;商城专区改为北大甄选;
							
							
							
							
							
						 | 
						
							2025-10-14 09:42:29 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								542a42b9d7
								
							
						 | 
						
							
							
								
								## 众康领导奖、平级改为超500PV按500计算;
							
							
							
							
							
						 | 
						
							2025-10-13 13:22:57 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								eec0914773
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/test' into test
							
							
							
							
							
						 | 
						
							2025-10-13 12:03:46 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								f9811b92e3
								
							
						 | 
						
							
							
								
								## Fix - 市场动态异常[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=435]
							
							
							
							
							
						 | 
						
							2025-10-13 12:03:40 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								d8605f523c
								
							
						 | 
						
							
							
								
								## 精品专区直推、阶段计算由金额改为业绩;
							
							
							
							
							
						 | 
						
							2025-10-13 11:57:05 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								1476d779b6
								
							
						 | 
						
							
							
								
								## Fix - 市场动态异常[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=435]
							
							
							
							
							
						 | 
						
							2025-10-13 11:28:46 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a7330f8d7e
								
							
						 | 
						
							
							
								
								## 拨比处理;
							
							
							
							
							
						 | 
						
							2025-10-13 10:50:59 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								b8952b949b
								
							
						 | 
						
							
							
								
								## Fix - 市场动态异常[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=435]
							
							
							
							
							
						 | 
						
							2025-10-13 09:28:30 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								b46cc1de12
								
							
						 | 
						
							
							
								
								## Fix - 市场动态异常[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=436]
							
							
							
							
							
						 | 
						
							2025-10-13 09:28:29 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								3e3fc163b8
								
							
						 | 
						
							
							
								
								## 提现需要绑定银行卡;
							
							
							
							
							
						 | 
						
							2025-10-11 17:23:33 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								bb84d5fe59
								
							
						 | 
						
							
							
								
								## 顶点奖金拨比统计定时任务;顶点奖金拨比列表统计;
							
							
							
							
							
						 | 
						
							2025-10-11 17:23:33 +08:00 | 
						
					
				
					
						
							
							
								 
								woody
							
						 | 
						
							
							
							
							
							
								
							
							
								bc9dd261d2
								
							
						 | 
						
							
							
								
								feat(ApiCuMemberWithdraw): 提现改为灵活用工,不校验银行卡
							
							
							
							
							
						 | 
						
							2025-10-11 17:23:32 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								13a37de1f7
								
							
						 | 
						
							
							
								
								## 奖金表添加冗余字段;
							
							
							
							
							
						 | 
						
							2025-10-10 17:16:25 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								2583015282
								
							
						 | 
						
							
							
								
								## 奖金表添加冗余字段;
							
							
							
							
							
						 | 
						
							2025-10-10 17:09:24 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								8f65cdf697
								
							
						 | 
						
							
							
								
								## Fix - banner会员空体系异常
							
							
							
							
							
						 | 
						
							2025-10-10 11:12:00 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								407dec7e0c
								
							
						 | 
						
							
							
								
								## 专区枚举返回不走国际化;
							
							
							
							
							
						 | 
						
							2025-10-10 09:50:08 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a469493bf9
								
							
						 | 
						
							
							
								
								## 消费配置取值走枚举;
							
							
							
							
							
						 | 
						
							2025-10-10 09:41:46 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								90ab61fc2d
								
							
						 | 
						
							
							
								
								## Opt - 移动端市场动态总业绩
							
							
							
							
							
						 | 
						
							2025-10-09 17:18:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								50ff698bda
								
							
						 | 
						
							
							
								
								## bug425 发货清单订单类型修改
							
							
							
							
							
						 | 
						
							2025-10-09 17:12:52 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								0c00d28bdd
								
							
						 | 
						
							
							
								
								## 去掉不需要的奖衔查询处理;
							
							
							
							
							
						 | 
						
							2025-10-09 16:54:40 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								04205423f9
								
							
						 | 
						
							
							
								
								## Opt - 移动端市场动态总业绩
							
							
							
							
							
						 | 
						
							2025-10-09 16:54:30 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								674a35c0aa
								
							
						 | 
						
							
							
								
								## Opt - 移动端市场动态总业绩
							
							
							
							
							
						 | 
						
							2025-10-09 16:35:05 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								64f854ef23
								
							
						 | 
						
							
							
								
								## 个人业绩显示处理;
							
							
							
							
							
						 | 
						
							2025-10-09 16:31:30 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								2b0bf0de36
								
							
						 | 
						
							
							
								
								## 个人业绩显示处理;
							
							
							
							
							
						 | 
						
							2025-10-09 16:20:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								b471482af2
								
							
						 | 
						
							
							
								
								## bug431 业绩汇总汇总页调整
							
							
							
							
							
						 | 
						
							2025-10-09 10:26:12 +08:00 | 
						
					
				
					
						
							
							
								 
								woody
							
						 | 
						
							
							
							
							
							
								
							
							
								4c09f65e57
								
							
						 | 
						
							
							
								
								feat(RetailMemberVO): 会员信息页导出移除收益区域字段,注册业绩移除货币符号
							
							
							
							
							
						 | 
						
							2025-09-30 13:27:51 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								ceadd71b51
								
							
						 | 
						
							
							
								
								## 奖衔升级处理方式优化;
							
							
							
							
							
						 | 
						
							2025-09-30 13:27:49 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								ea80a5cac5
								
							
						 | 
						
							
							
								
								## 订单开票枚举替换
							
							
							
							
							
						 | 
						
							2025-09-30 10:55:38 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								1174abd26a
								
							
						 | 
						
							
							
								
								## bug425 物流管理菜单下订单类型转枚举
							
							
							
							
							
						 | 
						
							2025-09-30 10:39:40 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								9ea951c736
								
							
						 | 
						
							
							
								
								## bug425 物流管理菜单下订单类型转枚举
							
							
							
							
							
						 | 
						
							2025-09-30 09:44:33 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								5f4a6b8698
								
							
						 | 
						
							
							
								
								## bug425 物流管理菜单下订单类型转枚举
							
							
							
							
							
						 | 
						
							2025-09-30 09:43:26 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a4e8f8f8c6
								
							
						 | 
						
							
							
								
								## 奖衔计算方式改为先算奖衔;赠点排点方式问题修复;
							
							
							
							
							
						 | 
						
							2025-09-29 18:02:25 +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 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								a3aee14a0e
								
							
						 | 
						
							
							
								
								## Opt - 手机端奖金明细
							
							
							
							
							
						 | 
						
							2025-09-29 15:18:17 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								15dba62617
								
							
						 | 
						
							
							
								
								## 赠送点位处理;
							
							
							
							
							
						 | 
						
							2025-09-29 14:32:55 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								f388e583f1
								
							
						 | 
						
							
							
								
								## 去掉原来不需要MQ推送;奖金明细、奖金来源;
							
							
							
							
							
						 | 
						
							2025-09-29 14:32:54 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								06a9ada5a6
								
							
						 | 
						
							
							
								
								## Opt - 五折专区
							
							
							
							
							
						 | 
						
							2025-09-29 13:59:11 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								27fcffa5ca
								
							
						 | 
						
							
							
								
								## 奖衔升级处理;
							
							
							
							
							
						 | 
						
							2025-09-29 13:46:55 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								2d683d0a58
								
							
						 | 
						
							
							
								
								## 调整奖金入库;
							
							
							
							
							
						 | 
						
							2025-09-29 13:46:54 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								c2dce5274c
								
							
						 | 
						
							
							
								
								## 奖衔计算,直推会员判断大小区使用团队业绩+个人业绩;
							
							
							
							
							
						 | 
						
							2025-09-29 11:33:58 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								b1c1ec9074
								
							
						 | 
						
							
							
								
								## Opt - 业绩统计细化
							
							
							
							
							
						 | 
						
							2025-09-29 11:08:40 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								f5584a64c7
								
							
						 | 
						
							
							
								
								## 领导奖、平级奖计算;
							
							
							
							
							
						 | 
						
							2025-09-29 10:15:18 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								a1e7a85fc5
								
							
						 | 
						
							
							
								
								## Opt - 商品详情,42强转41
							
							
							
							
							
						 | 
						
							2025-09-29 09:53:22 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								7f6ac2347a
								
							
						 | 
						
							
							
								
								## bug421 查询表名修改,查询错误返回错误信息
							
							
							
							
							
						 | 
						
							2025-09-29 09:26:16 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								c21f641973
								
							
						 | 
						
							
							
								
								## bug421 查询表名修改
							
							
							
							
							
						 | 
						
							2025-09-29 09:08:57 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								4ec7863084
								
							
						 | 
						
							
							
								
								## 领导奖、平级奖计算;
							
							
							
							
							
						 | 
						
							2025-09-28 18:03:47 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								a2a828d71a
								
							
						 | 
						
							
							
								
								## 阶段配置考核奖衔返回值修改
							
							
							
							
							
						 | 
						
							2025-09-28 17:53:31 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								6ded77fea8
								
							
						 | 
						
							
							
								
								## 架构修改,阶段配置修改,子节点排序,会员子节点添加未完成数量
							
							
							
							
							
						 | 
						
							2025-09-28 17:24:35 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								0378dd3d50
								
							
						 | 
						
							
							
								
								## 日结奖衔计算处理;
							
							
							
							
							
						 | 
						
							2025-09-28 15:52:10 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								5ca7df77ee
								
							
						 | 
						
							
							
								
								## Opt - 等级翻译
							
							
							
							
							
						 | 
						
							2025-09-28 15:27:34 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								50c9fc0a1d
								
							
						 | 
						
							
							
								
								## Opt - 市场动态
							
							
							
							
							
						 | 
						
							2025-09-28 14:11:20 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								1fc421a74d
								
							
						 | 
						
							
							
								
								## 奖衔实体调整;
							
							
							
							
							
						 | 
						
							2025-09-28 14:03:34 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								6442f2bbfb
								
							
						 | 
						
							
							
								
								## Opt - 市场动态-取消自己虚拟区&取消计算个人业绩
							
							
							
							
							
						 | 
						
							2025-09-28 13:40:40 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e5c1287d22
								
							
						 | 
						
							
							
								
								## 结算新字段兼容;
							
							
							
							
							
						 | 
						
							2025-09-28 11:32:20 +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 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								f336435346
								
							
						 | 
						
							
							
								
								## 日结处理业绩;
							
							
							
							
							
						 | 
						
							2025-09-28 09:06:00 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e4e58f0253
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into test
							
							
							
							
							
							
							
							# Conflicts:
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICumemberRetailDetailService.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
#	bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml 
							
						 | 
						
							2025-09-26 18:03:36 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								6db021e8b0
								
							
						 | 
						
							
							
								
								## 日结处理业绩;
							
							
							
							
							
						 | 
						
							2025-09-26 17:55:40 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								f832063a17
								
							
						 | 
						
							
							
								
								## 导出请求修改
							
							
							
							
							
						 | 
						
							2025-09-26 17:49:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								e1da81afaa
								
							
						 | 
						
							
							
								
								## 导出请求修改
							
							
							
							
							
						 | 
						
							2025-09-26 17:48:47 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								db2d7f365c
								
							
						 | 
						
							
							
								
								## 导出请求值修改
							
							
							
							
							
						 | 
						
							2025-09-26 17:37:56 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								89583fe096
								
							
						 | 
						
							
							
								
								## 导出请求值修改
							
							
							
							
							
						 | 
						
							2025-09-26 17:37:35 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								611121162b
								
							
						 | 
						
							
							
								
								## bug419 导出接收字段修改
							
							
							
							
							
						 | 
						
							2025-09-26 17:17:42 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								5ab49626cf
								
							
						 | 
						
							
							
								
								## bug419 导出接收字段修改
							
							
							
							
							
						 | 
						
							2025-09-26 17:17:20 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								299686f9a9
								
							
						 | 
						
							
							
								
								## 导出修改,会员子点信息排序
							
							
							
							
							
						 | 
						
							2025-09-26 17:07:34 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								2955a2038e
								
							
						 | 
						
							
							
								
								## 会员点位信息排序查询
							
							
							
							
							
						 | 
						
							2025-09-26 17:06:12 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								caae0a9d5c
								
							
						 | 
						
							
							
								
								## 导出修改,会员子点信息排序
							
							
							
							
							
						 | 
						
							2025-09-26 17:00:22 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								ca9890ad4c
								
							
						 | 
						
							
							
								
								## Opt - 秒结-甄选数据算在注册专区
							
							
							
							
							
						 | 
						
							2025-09-26 16:46:31 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								d71ce0a57b
								
							
						 | 
						
							
							
								
								## 会员点位信息分页返回值修改
							
							
							
							
							
						 | 
						
							2025-09-26 16:23:06 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								ac43ec5553
								
							
						 | 
						
							
							
								
								## 会员点位信息分页返回值修改
							
							
							
							
							
						 | 
						
							2025-09-26 16:22:54 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								2384859022
								
							
						 | 
						
							
							
								
								## 分页返回值修改
							
							
							
							
							
						 | 
						
							2025-09-26 16:14:35 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangheng
							
						 | 
						
							
							
							
							
							
								
							
							
								daa9efe4e5
								
							
						 | 
						
							
							
								
								## 分页返回值修改
							
							
							
							
							
						 | 
						
							2025-09-26 16:14:15 +08:00 |