Commit Graph

1568 Commits

Author SHA1 Message Date
fzr ea1ee34d8a 修复删除角色bug 2023-05-12 11:00:05 +08:00
FZR 4a0cbc2c5b 修复bug: 角色删除报错,和删除部门、删除岗位问题 2023-05-12 10:31:52 +08:00
lr 312c6e7d5e Merge branch 'master' into develop 2023-04-13 10:20:34 +08:00
lr f2788e164e Merge branch 'hotfix/docker' 2023-04-13 10:20:34 +08:00
lr 4b585f171f 调整docker部署文档 2023-04-13 10:20:20 +08:00
lr b2188f45de Merge branch 'master' into develop 2023-04-13 03:03:35 +08:00
lr 1da5f90db5 Merge branch 'hotfix/docker' 2023-04-13 03:03:35 +08:00
lr a785ea6265 增加docker快速部署文档 2023-04-13 03:03:17 +08:00
Jason 861de3a0c8 调整微信登录填写头像昵称提示语 2023-04-04 15:04:38 +08:00
TinyAnts ce6934b886 Merge tag '1.5.0' into develop 2023-04-03 18:19:14 +08:00
TinyAnts 7cf3be989d Merge branch 'release/1.5.0' 2023-04-03 18:19:13 +08:00
TinyAnts af661249e6 修复缓存工具读取bug 2023-04-03 18:17:47 +08:00
TinyAnts ac3680fda8 Merge tag 'v1.5.0' into develop 2023-04-03 17:48:20 +08:00
TinyAnts add675f5c6 Merge branch 'release/v1.5.0' 2023-04-03 17:48:18 +08:00
TinyAnts 7c31ed57b4 调整版本 2023-04-03 17:45:08 +08:00
TinyAnts 7a6e2a755f 增加图标 2023-04-03 17:19:12 +08:00
Jason 3ea235351d Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 2023-04-03 17:08:42 +08:00
Jason acd1f22dfc 打包 2023-04-03 17:08:31 +08:00
TinyAnts fe9e4557ab 处理退款状态 2023-04-03 17:00:34 +08:00
TinyAnts 6010b19826 修复退款状态更新问题 2023-04-03 16:56:59 +08:00
TinyAnts b9f40163ab 调整充值记录 2023-04-03 16:52:44 +08:00
TinyAnts 0ba266804b 处理钱包日志 2023-04-03 16:34:25 +08:00
TinyAnts 36bb1f7b7d 处理钱包日志bug 2023-04-03 16:32:30 +08:00
TinyAnts e88f113183 优化图标 2023-04-03 16:13:07 +08:00
Jason c153122e99 打包 2023-04-03 15:15:24 +08:00
Jason b50df74802 余额充值,支付 2023-04-03 15:13:49 +08:00
TinyAnts 2b890b65f3 增加退款状态描述 2023-04-03 15:10:57 +08:00
TinyAnts f353f78a04 处理筛选问题 2023-04-03 14:43:46 +08:00
TinyAnts 31f6d5293b 处理日志路径 2023-04-03 14:21:08 +08:00
TinyAnts c96b3c210b 处理金额变动类型 2023-04-03 11:33:38 +08:00
TinyAnts d96bd7c3e5 增加退款状态 2023-04-03 11:16:53 +08:00
TinyAnts bb344261c3 调整日志记录列表返回数据 2023-04-03 11:14:11 +08:00
TinyAnts 7873cdf216 处理退款记录金额统计 2023-04-03 10:00:27 +08:00
TinyAnts b0a9b4570e 调整H5支付和充值 2023-04-01 11:17:11 +08:00
TinyAnts adc909db55 Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 2023-03-31 19:02:34 +08:00
TinyAnts ca93adfcaf 调整注释 2023-03-31 19:02:29 +08:00
Jason 923c2b1d72 h5支付调试 2023-03-31 19:02:12 +08:00
Jason 3fec3b5922 调试h5支付 2023-03-31 18:56:01 +08:00
Jason a1e15274e0 调试h5支付 2023-03-31 18:45:26 +08:00
TinyAnts e470a714b9 Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 2023-03-31 18:39:49 +08:00
TinyAnts 3a379a2bf4 修改h5链接 2023-03-31 18:39:36 +08:00
Jason eb266d6877 调试h5支付 2023-03-31 18:32:11 +08:00
Jason 12db298225 Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 2023-03-31 18:27:02 +08:00
Jason d2ff42dd32 调试h5支付 2023-03-31 18:26:53 +08:00
TinyAnts 05af28cf4d 调整h5支付链接 2023-03-31 18:25:09 +08:00
TinyAnts 3fcd297979 修改h5支付链接 2023-03-31 18:21:06 +08:00
TinyAnts 4f723d5237 处理H5支付重定向链接 2023-03-31 18:13:35 +08:00
TinyAnts 89598da689 处理H5端支付问题 2023-03-31 18:01:54 +08:00
TinyAnts 9267f497c2 调整H5支付 2023-03-31 17:47:48 +08:00
Jason e889caf07c 调试公众号支付 2023-03-31 17:00:28 +08:00