cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								b3a12a62f0
								
							
						 | 
						
							
							
								
								## 计算分红奖衔时,自己消费的虚拟区也算一个区;
							
							
							
							
							
						 | 
						
							2025-06-21 09:06:07 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								1a083b499b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-20 18:15:21 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								c1bb43f3bd
								
							
						 | 
						
							
							
								
								## Opt - 增加修改结算等级->最高等级下进行奖衔初始化
							
							
							
							
							
						 | 
						
							2025-06-20 18:15:13 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								f1264dd994
								
							
						 | 
						
							
							
								
								## 分红奖衔秒结处理;
							
							
							
							
							
						 | 
						
							2025-06-20 17:07:44 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								55f5e0523d
								
							
						 | 
						
							
							
								
								## 分红奖衔秒结处理;
							
							
							
							
							
						 | 
						
							2025-06-20 17:06:06 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								63cc9acb4a
								
							
						 | 
						
							
							
								
								## 分红奖衔撤单回退处理;
							
							
							
							
							
						 | 
						
							2025-06-19 17:41:24 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								283b041012
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-19 17:40:38 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								724ff1ae61
								
							
						 | 
						
							
							
								
								## 分红奖衔撤单回退处理;
							
							
							
							
							
						 | 
						
							2025-06-19 17:40:34 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								7af217edcd
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/origin/dev' into test
							
							
							
							
							
						 | 
						
							2025-06-19 17:35:53 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								01d77cdf10
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-19 17:35:29 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								0bceaa15d8
								
							
						 | 
						
							
							
								
								## Opt - PageUtils.clearPage AOP
							
							
							
							
							
						 | 
						
							2025-06-19 17:35:23 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								3b408c163b
								
							
						 | 
						
							
							
								
								## 会员列表返回分红奖衔;当月奖衔分析搜索条件报错处理;
							
							
							
							
							
						 | 
						
							2025-06-19 16:09:23 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7b5e4e264e
								
							
						 | 
						
							
							
								
								## get-info返回分红奖衔;
							
							
							
							
							
						 | 
						
							2025-06-19 16:09:23 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								bacedcfd33
								
							
						 | 
						
							
							
								
								## 秒结、日结恢复分红奖衔;
							
							
							
							
							
						 | 
						
							2025-06-19 16:09:22 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								17e5a70f85
								
							
						 | 
						
							
							
								
								## 会员列表返回分红奖衔;当月奖衔分析搜索条件报错处理;
							
							
							
							
							
						 | 
						
							2025-06-19 16:06:30 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7a17c2127e
								
							
						 | 
						
							
							
								
								## get-info返回分红奖衔;
							
							
							
							
							
						 | 
						
							2025-06-19 15:39:54 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a35e468103
								
							
						 | 
						
							
							
								
								## 秒结、日结恢复分红奖衔;
							
							
							
							
							
						 | 
						
							2025-06-19 15:30:23 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								6647920be4
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/origin/dev' into test
							
							
							
							
							
						 | 
						
							2025-06-19 13:39:56 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								f7f995c9c3
								
							
						 | 
						
							
							
								
								## Feat - 手改注册等级为合伙人时,如奖衔为空,则改为黄宝
							
							
							
							
							
						 | 
						
							2025-06-19 13:38:58 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								953b682f52
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/origin/dev' into test
							
							
							
							
							
						 | 
						
							2025-06-18 16:59:56 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								164a336558
								
							
						 | 
						
							
							
								
								## 替换国际化处理;
							
							
							
							
							
						 | 
						
							2025-06-18 16:46:04 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								4da0791b78
								
							
						 | 
						
							
							
								
								## 等级枚举不走国际化;
							
							
							
							
							
						 | 
						
							2025-06-18 16:36:53 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								dfc21bc3bd
								
							
						 | 
						
							
							
								
								## 等级枚举不走国际化;
							
							
							
							
							
						 | 
						
							2025-06-18 16:35:12 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								1f0f2aedc5
								
							
						 | 
						
							
							
								
								## 指定新零售在线支付测试账号;
							
							
							
							
							
						 | 
						
							2025-06-18 15:56:48 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								bdc00adc9e
								
							
						 | 
						
							
							
								
								## 指定新零售在线支付测试账号;
							
							
							
							
							
						 | 
						
							2025-06-18 15:27:06 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								6a0e9c7463
								
							
						 | 
						
							
							
								
								## 调整部门获取下个编号方法;
							
							
							
							
							
						 | 
						
							2025-06-18 11:23:39 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								236296dbc4
								
							
						 | 
						
							
							
								
								## Fix - 自动登录,获取systemType异常
							
							
							
							
							
						 | 
						
							2025-06-18 11:23:38 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								c2c50a8408
								
							
						 | 
						
							
							
								
								## 免密登录不校验用户支付状态;去掉7位用户编号单独登录方法;
							
							
							
							
							
						 | 
						
							2025-06-18 11:23:38 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e623987b61
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-18 11:22:26 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								af9a71f31a
								
							
						 | 
						
							
							
								
								## 调整部门获取下个编号方法;
							
							
							
							
							
						 | 
						
							2025-06-18 11:22:21 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								8804791eca
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-18 11:06:44 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								f4e2d9a16d
								
							
						 | 
						
							
							
								
								## Fix - 自动登录,获取systemType异常
							
							
							
							
							
						 | 
						
							2025-06-18 11:06:38 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								2feb0076e1
								
							
						 | 
						
							
							
								
								## 免密登录不校验用户支付状态;去掉7位用户编号单独登录方法;
							
							
							
							
							
						 | 
						
							2025-06-18 10:55:44 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								86b935a85a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into test
							
							
							
							
							
						 | 
						
							2025-06-18 10:45:18 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								de74a7b87d
								
							
						 | 
						
							
							
								
								## 调整会员、订单前缀;
							
							
							
							
							
						 | 
						
							2025-06-18 10:45:03 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								70dc1fcf46
								
							
						 | 
						
							
							
								
								## 处理业绩表方法;
							
							
							
							
							
						 | 
						
							2025-06-18 10:45:03 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								550225fb15
								
							
						 | 
						
							
							
								
								## 调整会员、订单前缀;
							
							
							
							
							
						 | 
						
							2025-06-18 10:33:42 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								2d51c2b60b
								
							
						 | 
						
							
							
								
								## 处理业绩表方法;
							
							
							
							
							
						 | 
						
							2025-06-17 17:34:38 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7bf86ffad5
								
							
						 | 
						
							
							
								
								## 处理业绩表方法;
							
							
							
							
							
						 | 
						
							2025-06-17 17:33:53 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								97309e5942
								
							
						 | 
						
							
							
								
								## 推荐正反查调整处理方式;
							
							
							
							
							
						 | 
						
							2025-06-17 17:29:13 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7bd14618d9
								
							
						 | 
						
							
							
								
								## 真实奖衔分析、等级升级查询;
							
							
							
							
							
						 | 
						
							2025-06-17 17:29:13 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								2d8ca9919f
								
							
						 | 
						
							
							
								
								## 去掉旧抗衰达人,调整推荐相关列表;
							
							
							
							
							
						 | 
						
							2025-06-17 17:29:12 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								b371c4e4b3
								
							
						 | 
						
							
							
								
								## 等级修改、0元注册、删除空点相关接口调整;
							
							
							
							
							
						 | 
						
							2025-06-17 17:29:12 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								3c679ce8a8
								
							
						 | 
						
							
							
								
								## 推荐正反查调整处理方式;
							
							
							
							
							
						 | 
						
							2025-06-17 17:28:17 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								f79e4a7ab6
								
							
						 | 
						
							
							
								
								## 真实奖衔分析、等级升级查询;
							
							
							
							
							
						 | 
						
							2025-06-17 16:57:14 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								45e3ec095c
								
							
						 | 
						
							
							
								
								## 去掉旧抗衰达人,调整推荐相关列表;
							
							
							
							
							
						 | 
						
							2025-06-17 16:03:53 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e89e09371f
								
							
						 | 
						
							
							
								
								## 等级修改、0元注册、删除空点相关接口调整;
							
							
							
							
							
						 | 
						
							2025-06-17 15:43:29 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								bdc917dce4
								
							
						 | 
						
							
							
								
								## Fix - 盒数计算大小区后排除注水
							
							
							
							
							
						 | 
						
							2025-06-17 14:18:37 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								52f8a8585f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-17 13:58:24 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								03780c8925
								
							
						 | 
						
							
							
								
								## Fix - 盒数计算大小区后排除注水
							
							
							
							
							
						 | 
						
							2025-06-17 13:58:19 +08:00 |