Commit Graph

1549 Commits

Author SHA1 Message Date
damonyuan
7f856fa4f0 Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 2024-11-18 14:30:35 +08:00
damonyuan
b68839128f debug 删除
fix login页面没正确跳转的bug
2024-11-18 14:30:25 +08:00
pan.wl.2
407eefd1ab 修复bug 2024-11-18 11:55:53 +08:00
damonyuan
9aef056550 feat ip长度增加兼容ipv6的长度 2024-11-18 10:06:03 +08:00
damonyuan
e3fe8bbf36 feat build admin 2024-11-16 16:38:00 +08:00
pan.wl.2
e6168f3ed1 修复bug 2024-11-16 16:05:18 +08:00
pan.wl.2
c07655f474 Merge remote-tracking branch 'origin/develop' into develop 2024-11-16 15:54:06 +08:00
pan.wl.2
c578ae0bf0 修复bug 2024-11-16 15:53:57 +08:00
damonyuan
157534b8c3 feat 重新构建admin 2024-11-16 15:39:14 +08:00
damonyuan
a36f2460bb Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 2024-11-16 15:36:55 +08:00
damonyuan
d96bf51bfc feat update menu 2024-11-16 15:36:48 +08:00
pan.wl.2
30c7742118 修复bug 2024-11-16 15:27:25 +08:00
damonyuan
ef8b00e6e0 feat 重新编译admin 2024-11-16 00:46:44 +08:00
damonyuan
022c7e134d feat 重新编译mobile 2024-11-16 00:46:23 +08:00
damonyuan
7ce2999b4e fix 修复tooltips 显示的位置错误的bug 2024-11-16 00:44:05 +08:00
damonyuan
95154dec62 fix 公众号支付宝支付跳转到PC 界面的bug
fix 个人中心设置背景色没有生效的bug
2024-11-16 00:12:46 +08:00
pan.wl.2
bfd39255c1 Merge remote-tracking branch 'origin/develop' into develop 2024-11-15 21:57:32 +08:00
pan.wl.2
dece7d4f7e 修复bug 2024-11-15 21:57:07 +08:00
damonyuan
92d262daf6 feat 公众号增加支付宝支付渠道 2024-11-15 15:05:54 +08:00
damonyuan
566c236df8 feat 调整支付成功接口返回的格式 2024-11-15 14:59:05 +08:00
damonyuan
1923c00b2d feat 重新编译admin 2024-11-15 14:25:29 +08:00
damonyuan
e72b661ed7 fix 订单详细报错的bug
feat 公众号登录的时候指定终端为2
feat 获取openid 的时候忽略终端条件
2024-11-15 14:19:32 +08:00
pan.wl.2
68fc947d81 修复bug 2024-11-15 14:11:40 +08:00
damonyuan
c67c0fd2cb fix 有bg没有正确返回image的bug 2024-11-15 01:04:06 +08:00
damonyuan
54c69af36d fix 小程序发起支付失败的bug 2024-11-15 00:32:31 +08:00
damonyuan
20e3ff0a02 fix 判断账号是否有绑定微信的条件忽略终端 2024-11-14 21:37:06 +08:00
damonyuan
3eebfae99d feat 补充漏掉的微信小程序绑定手机号的接口 2024-11-14 18:11:08 +08:00
pan.wl.2
74a11a02c7 修复bug 2024-11-14 18:01:11 +08:00
pan.wl.2
b7ae5a5423 修复bug 2024-11-14 15:15:49 +08:00
pan.wl.2
5818ee82ae 修复bug 2024-11-14 15:05:18 +08:00
pan.wl.2
a37ef07f90 修复bug 2024-11-14 14:59:46 +08:00
pan.wl.2
d917735ce2 Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 2024-11-14 14:41:37 +08:00
damonyuan
7bd650c006 feat 重新编译mobile 2024-11-14 14:09:16 +08:00
damonyuan
c1b4cc1670 fix 绑定微信小程序的terminal错误的bug
fix 绑定微信小程序后loading 不会消失的bug
2024-11-14 14:08:34 +08:00
damonyuan
089578941e fix 修复时而出现登录后,跳转失败的bug 2024-11-14 13:54:42 +08:00
damonyuan
5cd4a72bce feat 重新编译前端mobile,修复时而出现登录后,跳转失败的bug 2024-11-14 13:54:10 +08:00
pan.wl.2
82ee675ff6 Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 2024-11-14 13:49:54 +08:00
damonyuan
a6f3b05243 fix 因头像问题而导致insert 失败的error 2024-11-14 11:42:00 +08:00
damonyuan
e164296866 debug 2024-11-14 11:37:00 +08:00
damonyuan
bdba94b017 debug 2024-11-14 11:34:21 +08:00
damonyuan
5383eecd18 debug 2024-11-14 11:27:25 +08:00
damonyuan
6d8a1ce724 debug 2024-11-14 11:21:34 +08:00
damonyuan
1463ef8428 debug 2024-11-14 11:15:33 +08:00
damonyuan
dbb7f7b0e1 debug 删除调试信息 2024-11-13 23:55:17 +08:00
damonyuan
d796488622 feat 补充漏掉的文件 2024-11-13 23:49:35 +08:00
damonyuan
92abb0602f feat 重新编译mobile 2024-11-13 23:48:56 +08:00
pan.wl.2
021c9ef470 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java
2024-11-13 23:41:31 +08:00
pan.wl.2
13b0f2c9de 修改手机号重复问题 2024-11-13 23:40:44 +08:00
damonyuan
f4656d4f76 Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 2024-11-13 23:37:34 +08:00
damonyuan
f81d5cdf4d Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
# Conflicts:
#	uniapp/src/pages/login/login.vue
2024-11-13 23:37:24 +08:00