133 Commits

Author SHA1 Message Date
hy001
7ead4fcc85 Merge branch 'main' of https://gitea.haiyihy.com/hy/chatapp3-java 2026-07-01 14:52:48 +08:00
hy001
c73d224e19 筛选 2026-07-01 14:52:47 +08:00
local
d7c3fbf721 fix account unblock login cache 2026-06-30 23:16:10 +08:00
hy001
1826aa10ab 经理中心 2026-06-24 15:39:54 +08:00
hy001
21bab83eea 相关支付 2026-06-24 12:57:33 +08:00
hy001
720c7cec50 Block HK MO TW SG login regions 2026-06-22 13:36:29 +08:00
hy001
de95193bda 经理中心 2026-06-12 19:36:53 +08:00
hy001
c56c9db06f 修复显示 2026-06-09 16:14:23 +08:00
hy001
c7016d5ae4 增加订单导出 2026-06-09 15:43:05 +08:00
hy001
c8e9c8c257 增加导出 2026-06-04 12:11:55 +08:00
hy001
7f7649d6bd Merge branch 'test'
# Conflicts:
#	rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/TeamBillTask.java
#	rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/TeamManualSalaryPaymentClientServiceImpl.java
#	rc-service/rc-service-other/other-inner-endpoint/src/test/java/com/red/circle/other/app/inner/service/team/impl/TeamManualSalaryPaymentClientServiceImplTest.java
2026-06-01 19:58:08 +08:00
hy001
85f3ffbc10 自动结算 2026-06-01 19:46:48 +08:00
hy001
3c920ee208 fix: keep bill cycle switch while salary paused 2026-06-01 10:44:13 +08:00
hy001
e3be12cd8b 支持手动工资按月度账期发放 2026-05-29 20:56:57 +08:00
hy001
0464935619 增加支付版本判断 2026-05-25 23:22:51 +08:00
hy001
d799d68946 修复工资发放 2026-05-25 20:34:00 +08:00
hy001
c2bd1554f9 Merge branch 'test' 2026-05-25 20:07:17 +08:00
hy001
6573219751 修复送礼报错 2026-05-25 17:07:13 +08:00
hy001
c2e28b5cb3 增加校验 2026-05-25 16:22:18 +08:00
hy001
0260498bd3 CP关系申请 问题修复 2026-05-25 14:32:15 +08:00
hy001
f837d75d42 Fix manual salary top-up settlement 2026-05-25 14:23:17 +08:00
hy001
e5eeebf84a cp功能修复 2026-05-25 11:16:53 +08:00
hy001
6405052215 vip时间设置 2026-05-25 10:40:03 +08:00
hy001
98d80c6732 修复竟态 2026-05-23 21:26:35 +08:00
hy001
b98d91a2fb 修复时间问题 2026-05-23 21:14:47 +08:00
hy001
b9361ac3ff 增加新的接口 2026-05-23 21:05:03 +08:00
hy001
aab443ce34 修复重复发消息 2026-05-23 20:09:54 +08:00
hy001
32543b958c cp 2026-05-23 19:07:47 +08:00
hy001
5359be337d 修复一些问题 2026-05-23 14:54:40 +08:00
hy001
fa6b9be148 修复边界 2026-05-23 14:02:23 +08:00
hy001
3588d0aeee Merge branch 'main' into test 2026-05-23 13:18:30 +08:00
hy001
0bf810261f 修复首冲 2026-05-23 13:17:06 +08:00
hy001
dfb71f55a8 Merge branch 'main' into test 2026-05-23 12:20:10 +08:00
hy001
c99542ebe9 修改CP相关 2026-05-23 12:19:57 +08:00
hy001
3168637944 已有关系拒绝其他关系 2026-05-22 21:23:19 +08:00
hy001
dca9f12cb5 新增发IM C2c 2026-05-22 20:11:20 +08:00
hy001
a0461ce68c CP关系解绑需要金币 2026-05-22 19:17:41 +08:00
hy001
40a8f90e01 默认topic 2026-05-22 18:12:46 +08:00
hy001
8f573739a2 cp系统完善 2026-05-22 15:57:48 +08:00
hy001
9e37b347a3 cp积分 2026-05-22 13:27:22 +08:00
hy001
8e37a3d333 CP关系冷静期解除 2026-05-21 16:19:53 +08:00
hy001
3f59e5b653 CP 2026-05-21 15:43:38 +08:00
hy001
c02050274b fix manual salary received total display 2026-05-21 15:06:03 +08:00
hy001
8460125d79 expose manual salary role breakdown 2026-05-21 14:05:38 +08:00
hy001
d0d48d71ac include agent salary in manual settlement 2026-05-21 13:59:36 +08:00
hy001
3cef4fc322 fix manual salary settlement net payable 2026-05-21 13:46:33 +08:00
hy001
a48fddb613 Merge branch 'release/redis-memory-fix-20260521' of gitea.haiyihy.com:hy/chatapp3-java 2026-05-21 11:19:21 +08:00
hy001
7bc8b44450 Merge branch 'main' of gitea.haiyihy.com:hy/chatapp3-java 2026-05-21 11:19:05 +08:00
hy001
a8424ad5e3 分国家发放工资 2026-05-21 11:19:04 +08:00
hy001
1343fa4631 CP系统 2026-05-21 11:18:31 +08:00