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

634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mactj
2e9288c518 葡萄酒开卖 2021-01-15 17:28:39 +08:00
mactj
24ba3b9b87 修改中 2021-01-15 16:04:26 +08:00
mactj
5b023af01c 升级依赖 提升编译速度 2021-01-15 13:55:26 +08:00
mactj
71dc3e55d9 小程序首页 2021-01-15 12:00:20 +08:00
mactj
a722c67a96 报错引用 2021-01-14 16:51:18 +08:00
mactj
e323b2d970 忽略文件 2021-01-12 18:17:05 +08:00
mactj
09ab5ee17a 忽略文件 2021-01-12 18:16:01 +08:00
mactj
645d1f49cb 混入小程序 2021-01-12 18:04:14 +08:00
mactj
42d3c2c828 拦截器显示ip,完善小程序注册,用户手机号不再唯一 2021-01-12 18:00:15 +08:00
Machengtianjiang
a405b4e80e todo list 2021-01-08 13:46:26 +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
b3e000c255 部署配置 2020-12-24 17:26:13 +08:00
Machengtianjiang
49c6164445 端口配置 2020-12-24 17:25:16 +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
f44ff8477f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	README.md
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
 2020-12-16 12:44:21 +08:00
RuoYi
e23ad20186 README 2020-12-16 10:20:02 +08:00
RuoYi
6cf2a8edeb 升级SpringBoot到最新版本2.2.12 提升启动速度 2020-12-16 10:05:53 +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
67198aede9 README 2020-12-15 10:06:12 +08:00
RuoYi
4f33da2a3f 登录后push添加catch防止出现检查错误 2020-12-15 10:04:09 +08:00
疯狂的狮子li
1ec7073027 同步升级 3.3 2020-12-14 09:28:15 +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
89e1f2a53f 修改Set可能导致嵌套的问题 2020-12-13 15:01:03 +08:00
若依
6800a12014 !138 修改Set可能导致嵌套的问题 
Merge pull request !138 from BecomeDream/N/A
 2020-12-13 14:54:17 +08:00
疯狂的狮子li
8d4f3561d5 修复mybatis-plus插件不生效bug 2020-12-11 18:45:57 +08:00
BecomeDream
e8f63b2994 修改Set可能导致嵌套的问题 2020-12-11 18:16:57 +08:00
RuoYi
ecfe7006e2 代码生成预览支持高亮显示 2020-12-11 17:04:54 +08:00
疯狂的狮子li
8b88d91312 update README.md 2020-12-11 14:44:07 +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
若依
231bbf6928 !135 增加日志记录过滤对象类型（解决多文件场景报错） 
Merge pull request !135 from geruishi/master
 2020-12-11 13:24:03 +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
疯狂的狮子li
4e56f30381 修改 生成器controller模板缺导包 与 index页面兼容性 
Merge pull request !2 from dragonwzj/master
 2020-12-09 16:49:24 +08:00