Commit Graph

232 Commits

Author SHA1 Message Date
qimingjin 84abe7e83a 1.7版本发布 2021-07-04 20:22:39 +08:00
jinqiming 2fd9ad4650 修改官网 2021-07-03 17:07:56 +08:00
qimingjin d4bdc102af 重构消息中心 2021-07-02 22:43:36 +08:00
jinqiming cc7f5c8ded 修改官网 2021-07-01 19:39:25 +08:00
qimingjin 033c7f4aef 重构消息中心 2021-06-30 23:03:50 +08:00
jinqiming e4f8b10308 修改消息中心 2021-06-30 18:43:04 +08:00
qimingjin 035b07f8b1 重构消息中心 2021-06-29 23:17:58 +08:00
jinqiming 4375ec4e44 修改消息中心 2021-06-29 19:58:43 +08:00
qimingjin 16eb5da329 Merge branch 'master' into feature/develop1.7
# Conflicts:
#	snow-admin/src/main/resources/static/img/dingtalk.png
#	snow-system/src/main/java/com/snow/system/service/impl/SysUserServiceImpl.java
2021-06-22 22:48:12 +08:00
qimingjin b05ccd64a0 修复钉钉注册回调异常 2021-06-22 22:42:57 +08:00
qimingjin bf00b4a0d7 修复钉钉注册回调异常 2021-06-22 22:41:21 +08:00
qimingjin 7f5770edea 修复钉钉注册回调异常 2021-06-22 22:40:04 +08:00
qimingjin 7395f1983e 紧急修复添加系统角色时会删除流程角色 2021-06-22 21:06:42 +08:00
qimingjin 1055c8e7fb 修改角色 2021-06-22 21:02:43 +08:00
qimingjin 42ea3f1eca Merge remote-tracking branch 'origin/feature/develop1.7' into feature/develop1.7 2021-06-22 20:57:42 +08:00
qimingjin 057284b5b5 修改main的页 2021-06-22 20:57:26 +08:00
jinqiming 95cee3b443 向后加签 2021-06-16 17:11:07 +08:00
jinqiming 4e3227a055 主页适配 2021-06-11 15:34:06 +08:00
qimingjin 59493891ef 修改main的页 2021-06-10 20:47:03 +08:00
jinqiming 3a3398cff7 修改配置 2021-06-10 17:49:24 +08:00
qimingjin e4c1eb22c8 修改main的页 2021-06-09 21:39:40 +08:00
jinqiming c983eedfd3 新增前台 2021-06-09 19:44:04 +08:00
jinqiming 7fb63c90a6 新增前台 2021-06-09 17:55:49 +08:00
jinqiming 266d5bd16b 集成钉钉登录 2021-06-07 13:11:38 +08:00
jinqiming 66064d5d5e 修改图片 2021-06-07 10:13:52 +08:00
459816669@qq.com c7f42268b8 修改flowable配置 2021-06-06 20:11:54 +08:00
459816669@qq.com 4bbcf5cfaf 修改flowable配置 2021-06-06 20:06:59 +08:00
qimingjin ea9568f610 钉钉图标 2021-06-06 18:39:52 +08:00
qimingjin cbd8ba629e 钉钉图标 2021-06-06 16:27:02 +08:00
jinqiming b079b99279 集成支付宝登录 2021-06-06 15:48:28 +08:00
jinqiming dbe6994d09 新增企业微信扫描登录 2021-06-06 13:59:02 +08:00
qimingjin 174ae785f8 Merge branch 'feature/develop1.6'
# Conflicts:
#	snow-admin/src/main/resources/application-druid.yml
2021-06-03 20:58:30 +08:00
qimingjin d5b1ebf88f 新1.6版本 2021-06-03 20:57:27 +08:00
jiang_li 1214ca329d 生成请假单时设置申请人为当前用户 2021-06-02 09:08:54 +08:00
qimingjin c4d34f1877 新1.6版本 2021-05-17 22:52:03 +08:00
qimingjin 19509196ba 新1.6版本 2021-05-17 22:51:10 +08:00
qimingjin 2b25a18392 新1.6版本 2021-05-17 22:50:08 +08:00
qimingjin 8e0c31f808 Merge branch 'master' of https://gitee.com/qimingjin/snow
 Conflicts:
	snow-dingtalk/src/main/java/com/snow/dingtalk/listener/DepartmentEventService.java
2021-05-17 22:26:51 +08:00
qimingjin 5c3f1a382f 完善部门管理,完善请假和离职流程 2021-05-17 22:24:50 +08:00
qimingjin 31dd1d97e9 系统修复完善 2021-05-10 21:47:19 +08:00
459816669@qq.com 356b603e55 修改第三方登录 2021-05-08 20:38:08 +08:00
jinqiming 9b31643e83 集成钉钉登录 2021-05-08 17:51:20 +08:00
jinqiming 8ca13edc9b 新增钉钉2.0接口 2021-05-08 14:45:13 +08:00
jinqiming eebc8c524f 修改创建钉钉部门参数 2021-05-08 09:02:40 +08:00
qimingjin 57ca8ae41f 修改更新日志 2021-05-03 20:30:54 +08:00
qimingjin 8dead25f39 修复tab页查询 2021-05-03 20:21:41 +08:00
qimingjin 3dea06e072 修复tab页查询 2021-05-03 18:01:15 +08:00
qimingjin 7d3edbd9de 完善消息中心 2021-05-02 12:45:39 +08:00
459816669@qq.com cd4a7be7f5 新增报表管理 2021-05-01 12:08:35 +08:00
jinqiming 5d08d9c8d9 集成积木报表 2021-04-26 15:12:48 +08:00