Commit Graph

1222 Commits

Author SHA1 Message Date
TinyAnts a70ec891d7 增加基类继承 2022-09-21 11:35:51 +08:00
TinyAnts d12cae1937 调整验证器增加基类 2022-09-21 11:29:36 +08:00
TinyAnts 78726b8373 增加验证器基类 2022-09-21 11:21:15 +08:00
TinyAnts 5dfea2ad46 修复文章分类删除bug 2022-09-21 10:32:17 +08:00
TinyAnts 6e0f1ade38 修复文章分类删除bug 2022-09-21 10:29:58 +08:00
TinyAnts f89d34915b 忽略文件 2022-09-21 10:26:42 +08:00
TinyAnts 8db154f01d 增加idea注释 2022-09-21 10:24:50 +08:00
TinyAnts 878f740bda 修复系统管理员账号被可被慕改bug 2022-09-21 10:07:24 +08:00
TinyAnts 1df98b147a 优化配置和静态资源 2022-09-21 09:59:51 +08:00
Jason cadad25176 菜单调整,资讯图标预览调整 2022-09-20 18:50:08 +08:00
Jason 73984d52c0 Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop 2022-09-20 18:49:02 +08:00
Jason c3ea44292f 视频播放 2022-09-20 18:48:47 +08:00
TinyAnts 02317bee8e 调整视频上传大小限制 2022-09-20 18:43:48 +08:00
Jason 61dc2bf16d 调整登录页面样式 2022-09-20 16:23:29 +08:00
Jason db45652f28 打包 2022-09-20 15:44:27 +08:00
Jason 51b35b664d 调整备注 2022-09-20 12:15:36 +08:00
Jason 29999f4e4a 调整登录,注册 2022-09-20 12:15:08 +08:00
Jason 77fb6acc2d 个人中心账号复制,切换tab页面时报错 2022-09-20 11:36:41 +08:00
Jason b512eac708 调整工具函数 2022-09-20 11:06:54 +08:00
Jason 654c7b3c11 后台打包 2022-09-20 11:00:40 +08:00
Jason fe5522dc2d 多标签tabs 调整 2022-09-20 10:58:38 +08:00
Jason aee93d81b4 修改部门验证 2022-09-19 15:26:00 +08:00
Jason 56da1c18dd 部分多行文本框添加字数限制 2022-09-19 15:20:43 +08:00
Jason ccd4747203 修复富文本编辑器样式问题 2022-09-19 14:52:45 +08:00
Jason 5240b89b35 后台打包 2022-09-19 14:04:54 +08:00
Jason db7a0e3161 后台-岗位-文案错误 2022-09-19 12:13:58 +08:00
Jason 8f52978021 后台-热搜-删除搜索的id 2022-09-19 12:13:26 +08:00
Jason 83469090dd 字典数据无法访问bug 2022-09-19 12:12:40 +08:00
Jason fa4de3214d Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop 2022-09-19 12:12:03 +08:00
Jason 65da3d4a3a 素材中心优化 2022-09-19 12:11:54 +08:00
TinyAnts a7e50bf511 修复后台上传视频获取不到名称bug 2022-09-19 11:57:35 +08:00
TinyAnts e40689135f 修复前端默认logo与后台不一致bug 2022-09-19 10:10:43 +08:00
TinyAnts 3560cd45c5 Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 2022-09-19 10:07:44 +08:00
TinyAnts 8d75e4c934 修复微信授权登录都是同一个账号bug 2022-09-19 10:07:27 +08:00
lr 9393de9063 Merge branch 'hotfix/lr-20220818-redeme' 2022-09-18 16:29:40 +08:00
lr e0f11a53e2 Merge branch 'master' into develop 2022-09-18 16:29:40 +08:00
lr b142dee20f 调整REMDME信息 2022-09-18 16:29:18 +08:00
lr 3d83b85588 Merge branch 'hotfix/lr-20220818' 2022-09-18 16:27:04 +08:00
lr 18cbb4374c Merge branch 'master' into develop 2022-09-18 16:27:04 +08:00
lr ba7560b9e2 调整README信息 2022-09-18 16:26:42 +08:00
Jason b7e010b634 Merge tag 'wjx202209160658' into develop
no message
2022-09-16 18:59:59 +08:00
Jason 8167380abe Merge branch 'hotfix/wjx202209160658' 2022-09-16 18:59:59 +08:00
Jason c69c104cd6 打包 2022-09-16 18:59:46 +08:00
Jason 370cde09c4 Merge tag 'wjx202209160657' into develop
no message
2022-09-16 18:58:25 +08:00
Jason 5ae19337d9 Merge branch 'hotfix/wjx202209160657' 2022-09-16 18:58:25 +08:00
Jason 387b38a009 删除h5打包 2022-09-16 18:58:10 +08:00
Jason 8ee7d03ce2 Merge tag 'wjx202209160652' into develop
no message

# Conflicts:
#	h5/assets/account.304e4c09.js
#	h5/assets/index.5ddae38f.js
#	h5/assets/news-card.cacc1bdf.js
#	h5/assets/pages-bind_mobile-bind_mobile.1e39d2a7.js
#	h5/assets/pages-change_password-change_password.5516de7d.js
#	h5/assets/pages-collection-collection.5d101da7.js
#	h5/assets/pages-customer_service-customer_service.35e5d1d2.js
#	h5/assets/pages-forget_pwd-forget_pwd.0cebded6.js
#	h5/assets/pages-index-index.e7cbfcb8.js
#	h5/assets/pages-login-login.3d278588.js
#	h5/assets/pages-news-news.e71c4738.js
#	h5/assets/pages-news_detail-news_detail.32038bef.js
#	h5/assets/pages-register-register.07ea7f19.js
#	h5/assets/pages-search-search.fb4812e5.js
#	h5/assets/pages-user-user.97ccd207.js
#	h5/assets/pages-user_data-user_data.1a85e802.js
#	h5/assets/pages-user_set-user_set.a86f2f01.js
#	h5/assets/pages-webview-webview.320ac922.js
#	h5/assets/tabbar.3ac4b4ec.js
#	h5/assets/u-avatar.aaafa077.js
#	h5/assets/u-button.f89bd070.js
#	h5/assets/u-checkbox.e15726da.js
#	h5/assets/u-form-item.f2bc17f6.js
#	h5/assets/u-form.e908a5a2.js
#	h5/assets/u-icon.947d1557.js
#	h5/assets/u-image.f03d2bad.js
#	h5/assets/u-parse.466924cc.js
#	h5/assets/u-popup.c389a818.js
#	h5/assets/u-search.939c3f7f.js
#	h5/assets/u-verification-code.8f91217a.js
#	h5/assets/uni.fb5f5659.css
#	h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.e582869e.js
#	h5/assets/z-paging.34848bf3.js
#	h5/index.html
2022-09-16 18:55:34 +08:00
Jason 915b989e7b Merge branch 'hotfix/wjx202209160652' 2022-09-16 18:54:43 +08:00
Jason a2e1541538 h5-打包 2022-09-16 18:54:32 +08:00
TinyAnts 849335def9 Merge branch 'master' of https://gitee.com/likeadmin/likeadmin_java 2022-09-16 18:49:39 +08:00