Commit graph

60 commits

Author SHA1 Message Date
zykzhangyukang aa78d89794 解决库存无法显示图表的Bug 2020-12-15 22:28:59 +08:00
zykzhangyukang f5f296741f 移除一些无关的文件 2020-12-15 21:04:07 +08:00
小章鱼鸭 9147523df2
Merge pull request #7 from zykzhangyukang/dependabot/npm_and_yarn/xinguan-vue/http-proxy-1.18.1
Bump http-proxy from 1.18.0 to 1.18.1 in /xinguan-vue
2020-12-15 21:01:52 +08:00
小章鱼鸭 4d38be0e33
Merge pull request #6 from zykzhangyukang/dependabot/npm_and_yarn/xinguan-vue/websocket-extensions-0.1.4
Bump websocket-extensions from 0.1.3 to 0.1.4 in /xinguan-vue
2020-12-15 21:01:34 +08:00
小章鱼鸭 026721319e
Merge pull request #8 from zykzhangyukang/dependabot/npm_and_yarn/xinguan-vue/highlight.js-9.18.5
Bump highlight.js from 9.18.1 to 9.18.5 in /xinguan-vue
2020-12-15 21:01:06 +08:00
小章鱼鸭 26daa13d95
Merge pull request #9 from zykzhangyukang/dependabot/npm_and_yarn/xinguan-vue/elliptic-6.5.3
Bump elliptic from 6.5.2 to 6.5.3 in /xinguan-vue
2020-12-15 21:00:50 +08:00
小章鱼鸭 64fe212e31
Merge pull request #10 from zykzhangyukang/dependabot/npm_and_yarn/xinguan-vue/acorn-6.4.2
Bump acorn from 6.4.0 to 6.4.2 in /xinguan-vue
2020-12-15 21:00:30 +08:00
小章鱼鸭 22f498abc6
Merge pull request #11 from zykzhangyukang/dependabot/npm_and_yarn/xinguan-vue/lodash-4.17.20
Bump lodash from 4.17.15 to 4.17.20 in /xinguan-vue
2020-12-15 20:59:41 +08:00
dependabot[bot] b76c6fb48f
Bump lodash from 4.17.15 to 4.17.20 in /xinguan-vue
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.20)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-15 12:51:10 +00:00
dependabot[bot] 5d6ae93e2a
Bump elliptic from 6.5.2 to 6.5.3 in /xinguan-vue
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-15 12:51:08 +00:00
dependabot[bot] 02a3826650
Bump acorn from 6.4.0 to 6.4.2 in /xinguan-vue
Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.2.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.2)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-15 12:51:08 +00:00
dependabot[bot] d873dd555f
Bump http-proxy from 1.18.0 to 1.18.1 in /xinguan-vue
Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/http-party/node-http-proxy/compare/1.18.0...1.18.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-15 12:51:07 +00:00
dependabot[bot] da6948338d
Bump highlight.js from 9.18.1 to 9.18.5 in /xinguan-vue
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 9.18.1 to 9.18.5.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/9.18.5/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/9.18.1...9.18.5)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-15 12:51:07 +00:00
dependabot[bot] 60462a4c33
Bump websocket-extensions from 0.1.3 to 0.1.4 in /xinguan-vue
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-15 12:51:06 +00:00
zykzhangyukang 8e177bf189 maven聚合工程重构项目,重构前端项目 2020-12-15 20:48:14 +08:00
zykzhangyukang 53f4774d6f update md5 test 2020-09-09 20:44:27 +08:00
zykzhangyukang b08fb22fc1 Merge branch 'master' of github.com:zykzhangyukang/Xinguan 2020-09-09 20:41:45 +08:00
zykzhangyukang 3fce74cf12 修复商品分类管理的bug 2020-09-09 20:41:18 +08:00
小章鱼鸭 b7db5c04f4
Update MD5Test.java 2020-08-25 22:10:29 +08:00
zykzhangyukang 97b037f170 更新sql文件 2020-08-19 19:34:26 +08:00
zykzhangyukang 180a61f073 upldate 2020-08-19 19:22:14 +08:00
zykzhangyukang e8e19ba173 更新部分代码 2020-08-19 19:14:37 +08:00
zykzhangyukang 69e91d4421 删除一些IDEA的无用文件 2020-08-19 14:00:03 +08:00
zykzhangyukang 6f78a2fe75 修改删除逻辑 2020-05-29 21:00:37 +08:00
zykzhangyukang 2dcde12a3c 重构代码 2020-05-29 17:54:29 +08:00
zykzhangyukang 920769a7e0 BizException重命名为ServiceException 2020-05-29 13:04:19 +08:00
zykzhangyukang aa336976dd 重构目录结构 2020-05-29 12:55:15 +08:00
zykzhangyukang 53213fe0eb 1. 解决普通用户更新菜单刷新后无法更新的Bug, 2. 更新不能禁用当前用户 2020-05-29 12:20:39 +08:00
zykzhangyukang bec4a29346 Merge branch 'master' of https://github.com/zykzhangyukang/Xinguan 2020-05-28 23:21:59 +08:00
zykzhangyukang e87aafabe4 更新sql文件 2020-05-28 23:20:17 +08:00
小章鱼鸭 25a85b4863
Update README.md 2020-05-28 23:16:31 +08:00
zykzhangyukang 9b88d3e047 物资发放模块完成 2020-05-26 10:07:40 +08:00
zykzhangyukang 1a75aaae84 提交入库单时,可一并添加来源方信息 2020-05-18 14:43:02 +08:00
zykzhangyukang e19ad0fea6 修改AOP操作 2020-05-16 12:12:50 +08:00
zykzhangyukang 9132dabb2a Merge branch 'master' of https://github.com/zykzhangyukang/Xinguan 2020-05-14 21:12:10 +08:00
zykzhangyukang a1d04a2181 添加物资发放管理 2020-05-14 21:11:25 +08:00
zykzhangyukang 004340cf6f 完成用户健康打卡,物资添加多级分类查询,优化代码 2020-05-14 21:09:58 +08:00
小章鱼鸭 2ccdd2744a
Update README.md 2020-05-04 21:21:52 +08:00
zykzhangyukang 185b0540ad update xinguan.sql 2020-05-04 21:01:50 +08:00
zykzhangyukang 10fdfd9315 添加逻辑删除,和物资入库审核,商品审核等.. 2020-04-30 19:20:22 +08:00
zykzhangyukang 24f30ef805 防止XSS攻击 2020-04-29 10:46:45 +08:00
zykzhangyukang 1a07afb3ef 完成登入报表,添加物资回收 2020-04-28 13:27:05 +08:00
zykzhangyukang 6fc8798d0c 添加图片附件管理,修改物资来源表,修改物资去向表 2020-04-25 22:15:06 +08:00
zykzhangyukang 7648d9a933 修复用户菜单无法获取菜单的BUG, 2020-04-20 18:52:49 +08:00
zykzhangyukang 952d490987 添加用户导出excel表格接口 2020-04-17 19:19:21 +08:00
zykzhangyukang e42ff8384d 完成物资库存模块 2020-04-16 13:37:04 +08:00
zykzhangyukang 921df0f8e3 token过期时间2小时,物资可编辑分类 2020-04-14 13:54:14 +08:00
zykzhangyukang 42f8f6a036 controller重不处理已异常 2020-04-11 10:44:54 +08:00
zykzhangyukang e4a7d485c1 修改部分API请求方法,添加操作方法日志 2020-04-04 16:40:41 +08:00
zykzhangyukang 1682fe9178 添加AOP操作日志 2020-04-02 21:00:29 +08:00