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 |
|
Jason
|
9be1caf811
|
Merge tag 'wjx202209160644' into develop
no message
# Conflicts:
# h5/assets/account.461df912.js
# h5/assets/index.4cc19f69.js
# h5/assets/news-card.f9659a05.js
# h5/assets/news.7d996083.js
# h5/assets/pages-as_us-as_us.8bc9b466.js
# h5/assets/pages-bind_mobile-bind_mobile.34dd4d4a.js
# h5/assets/pages-change_password-change_password.16c95aef.js
# h5/assets/pages-collection-collection.7f1501b9.js
# h5/assets/pages-customer_service-customer_service.bd6a8b1f.js
# h5/assets/pages-forget_pwd-forget_pwd.ed85d829.js
# h5/assets/pages-index-index.19c7f55a.js
# h5/assets/pages-login-login.432b5d68.js
# h5/assets/pages-news-news.b7c7c850.js
# h5/assets/pages-register-register.b6b6ae54.js
# h5/assets/pages-search-search.26e01199.js
# h5/assets/pages-user-user.3fd280ce.js
# h5/assets/pages-user_data-user_data.6cd74f38.js
# h5/assets/pages-user_set-user_set.5b8235ee.js
# h5/assets/pages-webview-webview.d074f33b.js
# h5/assets/tabbar.32c15533.js
# h5/assets/u-avatar.40df6bc2.js
# h5/assets/u-button.eb2fc020.js
# h5/assets/u-checkbox.a3de132d.js
# h5/assets/u-form-item.80dd7f49.js
# h5/assets/u-form.9f54964a.js
# h5/assets/u-icon.adf02ff2.js
# h5/assets/u-image.554b827f.js
# h5/assets/u-parse.a2aa510a.js
# h5/assets/u-popup.2aaf05d4.js
# h5/assets/u-search.18076790.js
# h5/assets/u-verification-code.a41295d0.js
# h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.8be1cad8.js
# h5/assets/z-paging.ae4248a3.js
# h5/index.html
|
2022-09-16 18:48:08 +08:00 |
|
Jason
|
2f8194e93b
|
Merge branch 'hotfix/wjx202209160644'
|
2022-09-16 18:46:33 +08:00 |
|
Jason
|
c6dd43762f
|
打包
|
2022-09-16 18:46:22 +08:00 |
|
Jason
|
53071be070
|
Merge tag 'wjx202209160640' into develop
no message
# Conflicts:
# h5/assets/account.304e4c09.js
# h5/assets/account.9ecc88ea.js
# h5/assets/account.e236fd55.js
# h5/assets/index.24de5888.js
# h5/assets/index.5ddae38f.js
# h5/assets/index.9d01590f.js
# h5/assets/news-card.0f53c999.js
# h5/assets/news-card.c91540ca.js
# h5/assets/news-card.cacc1bdf.js
# h5/assets/news.5c5bd132.js
# h5/assets/news.7d996083.js
# h5/assets/news.eb80f754.js
# h5/assets/pages-as_us-as_us.27714390.js
# h5/assets/pages-as_us-as_us.8bc9b466.js
# h5/assets/pages-as_us-as_us.a75e6bf4.js
# h5/assets/pages-bind_mobile-bind_mobile.1e39d2a7.js
# h5/assets/pages-bind_mobile-bind_mobile.3d1ff6fd.js
# h5/assets/pages-bind_mobile-bind_mobile.b0b2132a.js
# h5/assets/pages-change_password-change_password.3e609524.js
# h5/assets/pages-change_password-change_password.5516de7d.js
# h5/assets/pages-change_password-change_password.7fcdae1a.js
# h5/assets/pages-collection-collection.14907c26.js
# h5/assets/pages-collection-collection.53abd56e.js
# h5/assets/pages-collection-collection.5d101da7.js
# h5/assets/pages-customer_service-customer_service.0e4773a4.js
# h5/assets/pages-customer_service-customer_service.35e5d1d2.js
# h5/assets/pages-customer_service-customer_service.c942a0bb.js
# h5/assets/pages-forget_pwd-forget_pwd.0c22cfa7.js
# h5/assets/pages-forget_pwd-forget_pwd.0cebded6.js
# h5/assets/pages-forget_pwd-forget_pwd.41860f0c.js
# h5/assets/pages-index-index.21b55a1c.js
# h5/assets/pages-index-index.697592e8.js
# h5/assets/pages-index-index.e7cbfcb8.js
# h5/assets/pages-login-login.3d278588.js
# h5/assets/pages-login-login.583742c3.js
# h5/assets/pages-login-login.cc17b6ae.js
# h5/assets/pages-news-news.6e6dfc74.js
# h5/assets/pages-news-news.e71c4738.js
# h5/assets/pages-news-news.f27837dc.js
# h5/assets/pages-register-register.07ea7f19.js
# h5/assets/pages-register-register.127a8342.js
# h5/assets/pages-register-register.707197f6.js
# h5/assets/pages-search-search.5bd1eb0e.js
# h5/assets/pages-search-search.c9a4fc47.js
# h5/assets/pages-search-search.fb4812e5.js
# h5/assets/pages-user-user.29445b03.js
# h5/assets/pages-user-user.97ccd207.js
# h5/assets/pages-user-user.e6fd2164.js
# h5/assets/pages-user_data-user_data.1a85e802.js
# h5/assets/pages-user_data-user_data.2a0211b5.js
# h5/assets/pages-user_data-user_data.65619aff.js
# h5/assets/pages-user_set-user_set.9387105d.js
# h5/assets/pages-user_set-user_set.a86f2f01.js
# h5/assets/pages-user_set-user_set.d71e173b.js
# h5/assets/pages-webview-webview.183e0d8c.js
# h5/assets/pages-webview-webview.320ac922.js
# h5/assets/pages-webview-webview.c3fa2ff9.js
# h5/assets/shop.067e3a04.js
# h5/assets/tabbar.1370a2f3.js
# h5/assets/tabbar.3ac4b4ec.js
# h5/assets/tabbar.5a261344.js
# h5/assets/u-avatar.0975a40c.js
# h5/assets/u-avatar.665749d0.js
# h5/assets/u-avatar.aaafa077.js
# h5/assets/u-button.4291cf3a.js
# h5/assets/u-button.6324a944.js
# h5/assets/u-button.f89bd070.js
# h5/assets/u-checkbox.4a48075d.js
# h5/assets/u-checkbox.a9e5c7b5.js
# h5/assets/u-checkbox.e15726da.js
# h5/assets/u-form-item.8b18cdc2.js
# h5/assets/u-form-item.e8316076.js
# h5/assets/u-form-item.f2bc17f6.js
# h5/assets/u-form.718bda0a.js
# h5/assets/u-form.9d11b0a8.js
# h5/assets/u-form.e908a5a2.js
# h5/assets/u-icon.947d1557.js
# h5/assets/u-icon.b22654a8.js
# h5/assets/u-icon.b511ef4e.js
# h5/assets/u-image.2abefbca.js
# h5/assets/u-image.dcffbc78.js
# h5/assets/u-image.f03d2bad.js
# h5/assets/u-parse.2b02a1d4.js
# h5/assets/u-parse.466924cc.js
# h5/assets/u-parse.cd76eaa8.js
# h5/assets/u-popup.0657d28e.js
# h5/assets/u-popup.6fa83f64.js
# h5/assets/u-popup.c389a818.js
# h5/assets/u-search.939c3f7f.js
# h5/assets/u-search.9f49742b.js
# h5/assets/u-search.dad6632d.js
# h5/assets/u-verification-code.419886b4.js
# h5/assets/u-verification-code.8f91217a.js
# h5/assets/u-verification-code.9a7d2ff4.js
# h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.75f62b2e.js
# h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.859f9abd.js
# h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.e582869e.js
# h5/assets/util.7b793930.js
# h5/assets/z-paging.34848bf3.js
# h5/assets/z-paging.51f9fb6d.js
# h5/assets/z-paging.9a4d68b6.js
# h5/index.html
|
2022-09-16 18:43:18 +08:00 |
|
Jason
|
08bea98b36
|
Merge branch 'hotfix/wjx202209160640'
|
2022-09-16 18:42:53 +08:00 |
|
Jason
|
c0405ebaab
|
H5打包
|
2022-09-16 18:41:58 +08:00 |
|
TinyAnts
|
7a0b4259c2
|
Merge branch 'hotfix/default'
|
2022-09-16 18:39:48 +08:00 |
|
TinyAnts
|
769c1c0ff6
|
Merge branch 'master' into develop
|
2022-09-16 18:39:48 +08:00 |
|
TinyAnts
|
43da5265ff
|
调整获取微信手机号接口
|
2022-09-16 18:39:16 +08:00 |
|
TinyAnts
|
7cfb55124c
|
调整默认头像
|
2022-09-16 18:39:02 +08:00 |
|
TinyAnts
|
b660028a6c
|
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
|
2022-09-16 18:33:51 +08:00 |
|
TinyAnts
|
4ee067a1f7
|
Merge tag '1.3.0' into develop
|
2022-09-16 18:25:36 +08:00 |
|
TinyAnts
|
859f52708c
|
Merge branch 'release/1.3.0'
|
2022-09-16 18:25:34 +08:00 |
|
Jason
|
3f699d3c7c
|
打包
|
2022-09-16 18:23:03 +08:00 |
|
Jason
|
652dc05993
|
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
|
2022-09-16 18:15:46 +08:00 |
|
Jason
|
117584acba
|
保存二维码
|
2022-09-16 18:15:41 +08:00 |
|
TinyAnts
|
4753a299cb
|
调整sql文件
|
2022-09-16 18:15:28 +08:00 |
|
TinyAnts
|
fb8ffb9845
|
增加静态文件
|
2022-09-16 18:11:05 +08:00 |
|
Jason
|
855f6ca3e6
|
资讯内容样式
|
2022-09-16 18:04:30 +08:00 |
|
Jason
|
83df0dc001
|
Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
|
2022-09-16 17:58:28 +08:00 |
|
Jason
|
85e8d2d390
|
资讯收藏调整
|
2022-09-16 17:58:08 +08:00 |
|
TinyAnts
|
b324c745c8
|
Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop
|
2022-09-16 17:53:11 +08:00 |
|
TinyAnts
|
e5ad20dda3
|
增加静态资源
|
2022-09-16 17:52:58 +08:00 |
|
Jason
|
8c48b47cf4
|
打包
|
2022-09-16 17:50:39 +08:00 |
|
TinyAnts
|
7a36b5116b
|
增加静态资源图片
|
2022-09-16 17:44:22 +08:00 |
|
TinyAnts
|
2fae4ce8a6
|
fastjson版本调整
|
2022-09-16 17:38:20 +08:00 |
|
Jason
|
50aeb20502
|
修改路由
|
2022-09-16 17:13:56 +08:00 |
|
Jason
|
3ce89c21cf
|
修改密码bug
|
2022-09-16 17:13:12 +08:00 |