Commit Graph

57 Commits

Author SHA1 Message Date
caixiang
0e95d8c1d2 commit for pull 2023-04-03 10:59:34 +08:00
caixiang
ce46bafa60 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-24 11:54:49 +08:00
caixiang
9bce971af0 commit 2023-03-24 11:54:31 +08:00
7694dd8242 用户管理 创建时间 2023-03-24 11:20:42 +08:00
b6e61961f7 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-03-23 16:48:37 +08:00
42f4f2e741 包装箱名验证 2023-03-23 16:48:09 +08:00
caixiang
7789d2b1ab commit 2023-03-22 14:12:37 +08:00
caixiang
78c9cbd686 查询模组档位统计分布图 修改 2023-03-17 12:39:56 +08:00
6fe5b71e49 m 2023-03-07 12:12:37 +08:00
cd1bfc3287 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
 Conflicts:
	ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
2023-03-06 11:55:29 +08:00
bf0d6108a1 导出 2023-03-06 11:50:59 +08:00
caixiang
05684b5d2a 新增功率档位 统计报表 2023-03-06 11:24:16 +08:00
8fa7a486fd m 2023-03-02 20:05:41 +08:00
e405dcb06a commonfield 2023-03-02 17:02:10 +08:00
3f38072356 common 2023-03-02 15:12:54 +08:00
57b79b4f0e f 2023-03-02 13:22:49 +08:00
caixiang
fed8f82ff0 mark 2023-02-25 14:19:33 +08:00
1d8aff98c7 包装 2023-02-22 15:59:13 +08:00
weihongyang
f2091d56e2 init 2022-09-13 13:04:55 +08:00
weihongyang
fcf35bd12b 📝 fix: 修改excel和core配置 2022-08-18 10:34:23 +08:00
weihongyang
bf24b8a7e5 🎨 fix: 修改注释 2022-08-15 14:20:27 +08:00
weihongyang
c02c6cab10 🚑 feat:实体类增加删除标识 2022-08-10 08:49:11 +08:00
weihongyang
e644d027b2 🐛 fix:修改序列化 2022-08-09 16:10:18 +08:00
weihongyang
f5988be736 feat:新增退出功能 2022-08-09 14:21:05 +08:00
weihongyang
78fa6f42b0 🐛 fix:修复序列化问题 2022-08-09 11:05:44 +08:00
weihongyang
030abafd1f fix: 🐛修改分页不生效问题 2022-08-08 16:36:53 +08:00
weihongyang
16e656d820 feat: 增加操作日志的操作人和操作时间 2022-08-08 10:01:52 +08:00
weihongyang
c0f460e1e4 feat: 增加登录日志接口 2022-08-08 09:53:41 +08:00
weihongyang
3a91f8b8fe vscode测试 2022-07-25 16:57:49 +08:00
weihongyang
e9a39ae11b fix: 🐛修改字典数据controller的bug 2022-07-05 16:05:03 +08:00
f154d361a8 feat: 基础信息工具类
新增和修改时快速设置通用列
2022-07-05 10:45:06 +08:00
weihongyang
e277f2a32e feat: 给websocket的请求放行 2022-06-29 16:32:20 +08:00
weihongyang
1ac94e3d4c fix: 修改全局异常处理 2022-06-23 16:00:43 +08:00
weihongyang
093d6ee362 feat: sercurity的配置文件新增加LogoutHandler的实现类 在LogoutFilter之前加入jwtAuthenticationTokenFilter 2022-06-23 15:39:49 +08:00
weihongyang
aab0ea4479 fix: 修改验证码uuid参数默认是string 2022-06-23 15:31:55 +08:00
weihongyang
036cc1ac25 fix: 修改登录接口实现验证码功能 2022-06-23 14:02:00 +08:00
weihongyang
6be4ac7a62 feat: 新增验证码接口 2022-06-23 13:57:30 +08:00
weihongyang
c7c397e92d feat: 新增sercurity对于验证码接口的放行 2022-06-23 13:56:43 +08:00
weihongyang
204d758fcc feat: 新增CaptchaService实现类的方法 2022-06-23 13:55:17 +08:00
weihongyang
04f1bb339e feat: 新增CaptchaService实现类 2022-06-23 13:54:11 +08:00
weihongyang
42de3bd79c fix: 修改退出账号功能 2022-06-23 12:09:55 +08:00
weihongyang
3b6496773d feat: 新增账号密码在swagger有默认值 2022-06-23 11:56:20 +08:00
weihongyang
40c7df817b feat: 新增退出账号功能 2022-06-23 11:55:44 +08:00
weihongyang
45435f1cb4 feat: 新增sercurity的退出账号的配置 2022-06-23 11:52:54 +08:00
weihongyang
4d57b45a02 feat: 新增sercurity的LogoutSuccessHandler的实现类 2022-06-23 11:51:36 +08:00
weihongyang
47409787a4 feat: 新增sercurity的LogoutHandler的实现类 2022-06-23 11:51:19 +08:00
weihongyang
7fe617df56 fix: 修改jackson对日期的序列化支持格式 2022-06-23 09:47:51 +08:00
weihongyang
3a30a2a34c fix: 修改sercurity的UserDetailsService的实现类 2022-06-22 09:58:10 +08:00
weihongyang
4fe4936dfd fix: 修改全局异常捕获处理类 2022-06-22 09:57:39 +08:00
weihongyang
e130377e8c feat: 新增一个登录状态异常类 2022-06-22 09:56:52 +08:00