abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
645 Commits 4 Branches 22 Tags
Commit Graph

278 Commits

Author SHA1 Message Date
ZHUJB-PC\Administrator
52bcb6669f Merge branch 'master' of https://gitee.com/tottimctj/Hope-Mall 
# Conflicts:
#	hope-winery/src/main/java/com/ruoyi/winery/component/MiniComponent.java
#	hope-winery/src/main/java/com/ruoyi/winery/controller/NewsContentController.java
 2021-01-25 17:34:27 +08:00
ZHUJB-PC\Administrator
1216e561b7 完善了评论功能 2021-01-25 17:33:05 +08:00
mactj
44d8a0c9c1 新商户证书 2021-01-22 18:55:34 +08:00
mactj
25f19576a3 修正部署 2021-01-22 15:11:13 +08:00
mactj
be8f6b7576 增加了退款流程 2021-01-22 10:54:01 +08:00
mactj
db6d973592 一些修改 2021-01-21 11:29:21 +08:00
mactj
3f74f12301 修正订单 2021-01-21 10:10:44 +08:00
kino
ce3627ce11 活动管理 2021-01-20 17:51:47 +08:00
mactj
a423661c5e 修正样式 2021-01-20 16:05:22 +08:00
mactj
e19b458211 复数图片上传bug 2021-01-20 15:28:25 +08:00
kino
21bec38537 上传图片 2021-01-20 14:21:27 +08:00
mactj
9b8824842d 修正 2021-01-20 11:32:44 +08:00
mactj
2e09cd299b 一些修改 2021-01-20 10:39:13 +08:00
kino
5b1913482e 商户管理 2021-01-19 15:05:16 +08:00
kino
d8edac4483 回调 2021-01-19 13:52:28 +08:00
kino
6359692ea0 商户 2021-01-19 10:33:40 +08:00
kino
332e8116f8 微信统一下单 退款 2021-01-18 17:55:49 +08:00
kino
dc35283341 新增收货地址管理 2021-01-16 10:35:48 +08:00
mactj
42d3c2c828 拦截器显示ip,完善小程序注册,用户手机号不再唯一 2021-01-12 18:00:15 +08:00
yuanxin
95ea686ac1 增加了评论呢模块 2021-01-11 13:49:05 +08:00
Machengtianjiang
5ea0c5b143 增加字体 2021-01-08 09:38:18 +08:00
Machengtianjiang
345cad0956 商品和规格关联完成 2021-01-06 11:43:41 +08:00
Machengtianjiang
e65f914663 表单的导出 2021-01-05 11:29:25 +08:00
Machengtianjiang
b562da3b80 富文本上传图片 2021-01-04 16:42:44 +08:00
Machengtianjiang
29c6f7f24d cos配置 id配置 2020-12-31 14:40:36 +08:00
Machengtianjiang
bf62105bc7 图片上传完美了 2020-12-31 10:00:46 +08:00
Machengtianjiang
ec74a2d3de 修改了对象存储 2020-12-31 09:13:13 +08:00
Machengtianjiang
241de49166 增加一些商品管理内容 2020-12-28 16:34:06 +08:00
Machengtianjiang
ae58cafd81 小程序代码迁移完毕 2020-12-24 16:43:08 +08:00
Machengtianjiang
aa3e2a4f33 表单修正 2020-12-18 16:28:52 +08:00
Machengtianjiang
a8d61ef3be 修改样式 2020-12-18 14:03:33 +08:00
Machengtianjiang
b27fd40ab3 样式调整 2020-12-18 11:30:13 +08:00
Machengtianjiang
ca3a7de834 基本显示完成 2020-12-18 09:58:21 +08:00
Machengtianjiang
49c1a18e93 start 2020-12-17 17:50:57 +08:00
疯狂的狮子li
1249c7ca26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/views/login.vue
 2020-12-15 10:25:00 +08:00
RuoYi
4f33da2a3f 登录后push添加catch防止出现检查错误 2020-12-15 10:04:09 +08:00
疯狂的狮子li
7e476b941e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2020-12-14 09:27:27 +08:00
RuoYi
8988d0b4ab 若依 3.3.0 2020-12-14 09:02:10 +08:00
RuoYi
ceefa20aa2 调整代码生成页列宽 2020-12-13 16:05:49 +08:00
RuoYi
ecfe7006e2 代码生成预览支持高亮显示 2020-12-11 17:04:54 +08:00
疯狂的狮子li
f56f57a236 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/assets/styles/variables.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/components/Screenfull/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
 2020-12-11 14:27:54 +08:00
RuoYi
9e387dc447 去除用户手机邮箱部门必填验证 2020-12-11 13:26:14 +08:00
RuoYi
d6eac2dc8d 前端更新插件版本 2020-12-11 09:27:12 +08:00
RuoYi
b368ad764f 升级core-js到最新版本3.8.1 2020-12-10 12:08:18 +08:00
RuoYi
ffd5f0ce5d 升级vue-router到最新版本3.4.9 2020-12-10 11:14:44 +08:00
RuoYi
a50beae599 代码生成预览提供滚动机制 2020-12-10 11:13:39 +08:00
RuoYi
4d46f4c1b5 删除用户和角色解绑关联 2020-12-09 10:32:53 +08:00
〝走走停停
d6b6151aea update ruoyi-ui/src/assets/styles/ruoyi.scss. 2020-12-08 17:49:51 +08:00
RuoYi
fbc071a573 关闭页签清理缓存数据 2020-12-08 16:43:26 +08:00
RuoYi
6cfff90b4a 缓存仪表图设置默认大小 2020-12-08 16:13:21 +08:00