 sunjiabei
|
740aab5a58
|
Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期
|
5 days ago |
huangqizhen
|
dca5251872
|
Merge branch 'refs/heads/milestone-20251104-现金管理二期' into huangqizheng/feature-20251119150446-退款合并后
|
5 days ago |
|
huangqizhen
|
1cc2c448dd
|
11.20导出修复字段
|
5 days ago |
|
sunjiabei
|
59d8cb82cd
|
11月20日正则表达式
|
5 days ago |
|
sunjiabei
|
f6bd1c691d
|
11月20日汇总
|
5 days ago |
|
huangqizhen
|
641c32fbfb
|
修改币种与数量未除100的问题
|
6 days ago |
|
huangqizhen
|
3225233ec0
|
Merge branch 'refs/heads/huangqizheng/feature-20251119150446-退款合并后' into milestone-20251104-现金管理二期
|
6 days ago |
|
sunjiabei
|
1e26812c6a
|
11月19日活动更新
|
6 days ago |
|
huangqizhen
|
13218a0ae9
|
修改币种与数量未除100的问题
|
6 days ago |
|
sunjiabei
|
d380903fb2
|
11月19日活动更新
|
6 days ago |
|
sunjiabei
|
4d7f47a6c2
|
11月19日活动更新
|
6 days ago |
|
sunjiabei
|
9d777d7b8b
|
11月19日活动新增
|
6 days ago |
|
huangqizhen
|
2c5fb3fdc2
|
执行人姓名
|
6 days ago |
|
huangqizhen
|
66b8e9bbaf
|
Merge branch 'refs/heads/huangqizheng/feature-20251119150446-退款合并后' into milestone-20251104-现金管理二期
|
6 days ago |
|
huangqizhen
|
a95dfe37c0
|
合并代码2
|
6 days ago |
lijianlin
|
c1d11fc43e
|
11-19 收款消息发送
|
6 days ago |
|
lijianlin
|
bcaa35085d
|
Merge branch 'milestone-20251104-现金管理二期' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20251104110749-现金管理二期
|
6 days ago |
|
huangqizhen
|
d05fe1001f
|
合并代码
|
6 days ago |
|
huangqizhen
|
5253b135c2
|
Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期
|
6 days ago |
|
lijianlin
|
5157323c47
|
11-19找回auditMapper丢失的代码
|
6 days ago |
|
huangqizhen
|
2810ab6f27
|
Merge branch 'huangqizheng/feature-20251104113536-现金管理二期退款修改' into milestone-20251104-现金管理二期
# Conflicts:合并代码解决冲突
# src/main/resources/mapper/AuditMapper.xml
|
6 days ago |
|
huangqizhen
|
c28d3adf00
|
制造冲突
|
6 days ago |
|
huangqizhen
|
2fb7a10683
|
Merge branch 'refs/heads/huangqizheng/feature-20251104113536-现金管理二期退款修改' into milestone-20251104-现金管理二期
# Conflicts:
# src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
|
6 days ago |
|
huangqizhen
|
fe2a507e66
|
11.17 消息推送1
|
6 days ago |
|
sunjiabei
|
5e736e20dd
|
11月19日活动查询排序
|
6 days ago |
|
huangqizhen
|
ec004bf984
|
Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期
|
1 week ago |
|
huangqizhen
|
b500c8dfb1
|
11.17 消息推送
|
1 week ago |
|
lijianlin
|
76044f2535
|
11-17 收款金额非空+活动id展示
|
1 week ago |
|
sunjiabei
|
36ecee65c8
|
Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期
|
1 week ago |
|
sunjiabei
|
d92d19b187
|
11月14日活动接口校验
|
1 week ago |
|
huangqizhen
|
72675b0c65
|
11.14 消息推送
|
2 weeks ago |
|
lijianlin
|
bb13f9a02e
|
11-14 收款导出实体类优化
|
2 weeks ago |
|
huangqizhen
|
404aeaaf73
|
Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期
|
2 weeks ago |
|
huangqizhen
|
b1c4028ba6
|
Merge branch 'refs/heads/huangqizheng/feature-20251104113536-现金管理二期退款修改' into milestone-20251104-现金管理二期
# Conflicts:
# src/main/resources/cashMapper/CashCollectionMapper.xml
# src/main/resources/cashMapper/CashRefundMapper.xml
# src/main/resources/mapper/MarketMapper.xml
|
2 weeks ago |
|
sunjiabei
|
2b27f02a41
|
11月14日活动接口校验
|
2 weeks ago |
|
huangqizhen
|
7554bdebc7
|
11.11 sql修改
|
2 weeks ago |
|
lijianlin
|
a28775d1c8
|
11-14 新增收款，只能为本地区客户新增
|
2 weeks ago |
|
lijianlin
|
9151b8577b
|
11-14 收款导出注释补充
|
2 weeks ago |
|
sunjiabei
|
db487bbec7
|
11月13日消费接口报错信息修改
|
2 weeks ago |
|
sunjiabei
|
9b776f0998
|
Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期
|
2 weeks ago |
|
sunjiabei
|
14ac63bf91
|
11月13日消费接口修改，永久金币默认传0
|
2 weeks ago |
|
lijianlin
|
969d3d636f
|
11-13 收款导出修复
|
2 weeks ago |
wangguorui
|
9e84212c6e
|
消息推送更新（11.13）
|
2 weeks ago |
|
wangguorui
|
69e4ae3d92
|
Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期
# Conflicts:
# src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java
# src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
# src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
|
2 weeks ago |
|
wangguorui
|
f88b434838
|
消息推送（11.13）
|
2 weeks ago |
|
lijianlin
|
2d0eee5bee
|
11-12 收款导出修复
|
2 weeks ago |
|
huangqizhen
|
27c39a7094
|
11.11 导出修改
|
2 weeks ago |
|
huangqizhen
|
e01421ab2e
|
11.11 修改执行人
|
2 weeks ago |
|
huangqizhen
|
712afecf7f
|
Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期
|
2 weeks ago |
|
huangqizhen
|
6ce4a1d455
|
11.11 地区修改
|
2 weeks ago |
