Bo
|
a6ae06dc31
|
Merge branch 'dev' of gitee.com:septemyang/RuoYi into bo_dev
|
2021-08-13 11:40:36 +00:00 |
|
Bo
|
0ec7cce347
|
同步Ruoyi更新后，ExcelUtil.java中String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol();报错，暂时Mark掉
|
2021-08-13 19:37:51 +08:00 |
|
Bo
|
57ccaf3eb5
|
!22 同步RuoYi更新
Merge pull request !22 from Bo/master
|
2021-08-13 10:28:16 +00:00 |
|
Bo
|
78043a51db
|
Merge branch 'bo_dev' of gitee.com:septemyang/RuoYi into master
|
2021-08-13 10:27:54 +00:00 |
|
Bo
|
d9c6a862c2
|
增加TOPGP订阅快递及推送日志功能
修复根据快递单号获取快递公司编号问题
|
2021-08-13 17:29:01 +08:00 |
RuoYi
|
184cc11d1c
|
Excel注解图片导入兼容xls
|
2021-08-13 10:49:19 +08:00 |
|
RuoYi
|
5ca33901c5
|
补充遗漏的@Override注解
|
2021-08-13 10:16:33 +08:00 |
18326186802
|
fdacd1b4ab
|
增加关闭redis池资源
|
2021-08-13 09:29:59 +08:00 |
|
RuoYi
|
4ec04eda71
|
定时任务支持在线生成cron表达式
|
2021-08-12 16:29:50 +08:00 |
|
18326186802
|
2da88e0656
|
Merge branch 'dev' into kone_dev
|
2021-08-12 14:06:58 +08:00 |
|
18326186802
|
2c6ac7ebf9
|
Merge branch 'dev' of https://gitee.com/septemyang/RuoYi into dev
|
2021-08-12 14:06:09 +08:00 |
|
18326186802
|
2ffac19596
|
kettleV2.0.1:增加队列.增加状态和最后成功时间
|
2021-08-12 14:05:23 +08:00 |
|
RuoYi
|
e39f8f9127
|
Excel注解支持Image图片导入
|
2021-08-11 09:35:05 +08:00 |
|
若依
|
f34cd1d9b8
|
!321 update ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java.
Merge pull request !321 from Hacker/N/A
|
2021-08-11 01:31:57 +00:00 |
|
Bo
|
330f7eca9b
|
TOPGP订阅快递及推送
|
2021-08-10 15:53:53 +08:00 |
|
Bo
|
a22f446b28
|
TOPGP订阅快递及推送
|
2021-08-10 15:53:45 +08:00 |
Hacker
|
3bf25cc829
|
update ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java.
|
2021-08-10 03:40:35 +00:00 |
|
RuoYi
|
0606663fe8
|
支持配置是否开启记住我功能
|
2021-08-10 11:39:17 +08:00 |
|
若依
|
89719f0570
|
!320 update ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java.
Merge pull request !320 from Hacker/N/A
|
2021-08-10 03:32:24 +00:00 |
|
若依
|
6acfb0d5d9
|
!319 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java.
Merge pull request !319 from Hacker/N/A
|
2021-08-10 03:32:08 +00:00 |
|
Hacker
|
3f874d04ed
|
update ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java.
|
2021-08-10 02:48:50 +00:00 |
|
RuoYi
|
fba8008c81
|
移动端进入首页设置默认样式
|
2021-08-09 17:36:40 +08:00 |
|
Hacker
|
e8782ab4bf
|
update ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java.
|
2021-08-09 08:10:26 +00:00 |
|
18326186802
|
62ece10f60
|
Merge branch 'dev' of https://gitee.com/septemyang/RuoYi into kone_dev
|
2021-08-09 13:43:48 +08:00 |
|
18326186802
|
ed9277506d
|
poi版本降低.加入redis队列
|
2021-08-09 13:43:36 +08:00 |
|
Bo
|
be45eadf5c
|
!21 同步
Merge pull request !21 from Bo/dev
|
2021-08-09 03:54:06 +00:00 |
|
Bo
|
051a7695da
|
新增访问Topgp Webservice接口Demo
|
2021-08-09 11:50:32 +08:00 |
|
Bo
|
dfe9c1a75b
|
!20 新增访问TOPGP WebService接口
Merge pull request !20 from Bo/bo_dev
|
2021-08-09 02:42:15 +00:00 |
|
Bo
|
2723b5cd14
|
新增访问Topgp Webservice接口Demo
|
2021-08-09 10:29:30 +08:00 |
|
RuoYi
|
4142a733b8
|
升级bootstrap-fileinput到最新版本5.2.3
|
2021-08-08 16:48:42 +08:00 |
|
RuoYi
|
3601972228
|
update bin
|
2021-08-08 16:48:26 +08:00 |
|
Bo
|
69d476e628
|
修正快递查询
|
2021-08-07 22:28:47 +08:00 |
|
18326186802
|
a81ca0a5bb
|
计入队列执行任务
|
2021-08-06 16:07:43 +08:00 |
|
RuoYi
|
ef41439260
|
优化用户不能删除自己
|
2021-08-06 13:25:11 +08:00 |
|
RuoYi
|
e037173e14
|
提取通用方法到基类控制器
|
2021-08-06 13:23:38 +08:00 |
|
RuoYi
|
a87b1c93c0
|
默认开始/结束时间绑定控件选择类型
|
2021-08-06 13:16:02 +08:00 |
bo.yang
|
83bce07713
|
快递100授权信息，改到yml
|
2021-08-04 20:30:37 +08:00 |
|
bo.yang
|
e44e212af5
|
集成Jwt登录，支持TOPGP访问接口
Swagger文档完善（快递、帆软、TOPGP访问)
|
2021-08-04 17:33:15 +08:00 |
|
bo.yang
|
d5dcc8285d
|
集成Jwt登录，支持TOPGP访问接口
Swagger文档完善（快递、帆软、TOPGP访问)
|
2021-08-04 16:59:22 +08:00 |
|
bo.yang
|
36db7fa387
|
增加接受Topgp订阅快递请求处理方法
|
2021-08-03 09:12:51 +08:00 |
|
bo.yang
|
faf8fa55a9
|
Merge branch 'dev' of https://gitee.com/septemyang/RuoYi into bo_dev
|
2021-08-02 12:00:16 +08:00 |
|
Bo
|
bfc8da132e
|
!19 bo_dev更新
Merge pull request !19 from Bo/bo_dev
|
2021-08-02 03:59:58 +00:00 |
|
bo.yang
|
c8cc702b59
|
Merge branch 'dev' of https://gitee.com/septemyang/RuoYi into bo_dev
|
2021-08-02 11:57:06 +08:00 |
|
bo.yang
|
1b58ebf2e8
|
1、调整默认头像
2、如果用户状态为02（从OA同步），人员在职状态也不能做变更
|
2021-08-02 11:56:30 +08:00 |
|
Bo
|
3af444c6d5
|
!18 同步bo_dev
Merge pull request !18 from Bo/bo_dev
|
2021-08-01 17:02:30 +00:00 |
|
bo.yang
|
188a53bf7f
|
1、调整同步OA人员、部门的逻辑
2、人员同步保留系统原有头像，密码等信息
3、当部门参设置为从OA同步时，隐藏新增、编辑、删除按钮。
|
2021-08-02 00:58:21 +08:00 |
|
Bo
|
724a242f7a
|
!17 企业微信Toke改为存放到EHCache
Merge pull request !17 from Bo/bo_dev
|
2021-07-31 16:31:40 +00:00 |
|
bo.yang
|
934b2854aa
|
获取企业微信Token由存放到数据库，改为存放到EHCache缓存。
|
2021-08-01 00:29:14 +08:00 |
|
Bo
|
3f46f3d6d2
|
!16 同步RuoYi更新
Merge pull request !16 from Bo/master
|
2021-07-31 10:31:48 +00:00 |
|
RuoYi
|
0247a2d965
|
富文本默认dialogsInBody属性
|
2021-07-31 17:44:11 +08:00 |