 hecan
|
f90d1808a0
|
Merge branch 'grpU8' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into grpU8
|
2024-10-31 16:32:45 +08:00 |
|
hecan
|
bccd5f86b1
|
调整凭证接口，切换地址
|
2024-10-31 16:32:30 +08:00 |
 lvleigang
|
9abeb7015d
|
Merge branch 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-10-31 10:16:54 +08:00 |
|
hecan
|
47b511b98b
|
调整凭证接口，增加部门代码
|
2024-10-31 10:14:35 +08:00 |
|
hecan
|
7a90623777
|
判断指标新增时候预算方案代码只能为01或者02
|
2024-10-29 15:35:58 +08:00 |
|
hecan
|
715c83ac28
|
切换凭证推送地址，指标新增增加审核人id等条件判断
|
2024-10-14 15:19:57 +08:00 |
|
hecan
|
7e27fe43fc
|
调整凭证接口ip
|
2024-09-26 10:35:01 +08:00 |
|
hecan
|
85158a75a9
|
调整数据源为商学院的
|
2024-09-18 15:50:52 +08:00 |
|
hecan
|
6178513a72
|
商学院凭证插件
|
2024-09-18 14:53:31 +08:00 |
|
lvleigang
|
1ceaecbd28
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-18 14:38:02 +08:00 |
username
|
8ed7373134
|
消息模版被引用过，就无法删除
停用消息模版时，同步停用对应预警设置
推送消息时，校验预警设置中消息模版启用状态
预警设置启用时，校验该配置中对应消息模版是否启用
|
2024-09-18 14:15:19 +08:00 |
|
lvleigang
|
e019b30ea1
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-18 10:54:59 +08:00 |
|
lvleigang
|
6dcf6dbbea
|
修改跨域错误情况
|
2024-09-18 10:54:51 +08:00 |
|
username
|
b038b7e0c2
|
跨域报错、zt：url使用
|
2024-09-18 10:53:02 +08:00 |
|
username
|
0b13fc0432
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-09-18 10:37:44 +08:00 |
|
username
|
7409f90e2f
|
推送消息url改动，消息推送几个查询关联表sql语句补充sts=‘Y’
|
2024-09-18 10:37:36 +08:00 |
|
lvleigang
|
1add0bbee6
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-14 17:16:48 +08:00 |
476474485@qq.com
|
98efa0a7c9
|
解决移动端跨域问题
|
2024-09-14 17:15:52 +08:00 |
|
lvleigang
|
64d815ab49
|
Merge branch 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-14 16:59:55 +08:00 |
|
hecan
|
8611822520
|
新增显示类型字段
|
2024-09-14 16:12:48 +08:00 |
|
hecan
|
6a1fd93a41
|
Merge remote-tracking branch 'origin/grpU8' into grpU8
# Conflicts:
# service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
|
2024-09-14 16:10:41 +08:00 |
|
hecan
|
4028fef8cd
|
通用数据新增和更新树列表
|
2024-09-14 16:10:05 +08:00 |
|
lvleigang
|
ceee0b4b77
|
Merge branches 'dev' and 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-14 16:07:26 +08:00 |
|
lvleigang
|
636f365ad0
|
Merge branch 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-14 15:59:42 +08:00 |
|
hecan
|
f586f089bf
|
定时查询凭证与指标
|
2024-09-14 15:56:49 +08:00 |
|
username
|
55d5d4399d
|
消息日志、消息模版、预警设置、消息单次/定时推送
|
2024-09-14 15:50:13 +08:00 |
|
lvleigang
|
97a4f62a8d
|
修改主数据规则查询
|
2024-09-13 09:48:32 +08:00 |
|
lvleigang
|
3c4e5b9a81
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-11 14:11:52 +08:00 |
|
lvleigang
|
504c9e54c0
|
修改主数据保存信息
|
2024-09-11 14:07:03 +08:00 |
|
lvleigang
|
54867aee2c
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-09-11 14:05:20 +08:00 |
|
lvleigang
|
17518aa2d4
|
修改主数据保存信息
|
2024-09-11 14:04:44 +08:00 |
|
lvleigang
|
fb7e535f83
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-10 08:57:27 +08:00 |
yuqh
|
916a133c0c
|
OA无流程表单公用删除接口
|
2024-09-10 08:45:52 +08:00 |
|
lvleigang
|
3ef384e8e0
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
Conflicts:
buildpackage/src/main/resources/application-llg.yml
|
2024-09-10 08:38:01 +08:00 |
|
lvleigang
|
d6bdd3605f
|
u8c封装接口,测试修改
|
2024-09-09 17:32:47 +08:00 |
|
lvleigang
|
c78e10f059
|
esb添加消息推送方法
|
2024-09-09 14:20:48 +08:00 |
|
lvleigang
|
7af6143514
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-09-09 11:57:03 +08:00 |
|
username
|
927f8c5a7b
|
推送消息日志记录
|
2024-09-07 16:30:36 +08:00 |
|
username
|
c2ad1e3ea3
|
预警配置，预警接口，定时插件推送消息，消息模版配置，推送消息日志
|
2024-09-07 16:13:21 +08:00 |
|
username
|
24ab9a9dc1
|
Revert "预警配置，预警接口，定时插件推送消息，消息模版配置，推送消息日志"
This reverts commit 37b66cee8b.
|
2024-09-07 16:07:53 +08:00 |
|
username
|
37b66cee8b
|
预警配置，预警接口，定时插件推送消息，消息模版配置，推送消息日志
|
2024-09-07 16:02:27 +08:00 |
|
username
|
07d8962046
|
预警配置，定时插件推送消息，消息模版配置，推送消息日志
|
2024-09-07 14:12:25 +08:00 |
|
lvleigang
|
02e84aac28
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-07 11:47:59 +08:00 |
|
lvleigang
|
4391df3e02
|
u8c封装接口
|
2024-09-06 11:15:55 +08:00 |
|
lvleigang
|
9b514c36e9
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-09-06 10:09:29 +08:00 |
 xiang2lin
|
1f2d0584e2
|
钉钉接口
2024年9月5日16:00:12
xel
|
2024-09-05 16:00:23 +08:00 |
|
lvleigang
|
95a705c739
|
Merge branches 'dev' and 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-04 16:17:05 +08:00 |
|
lvleigang
|
5e7975ec5e
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-09-04 16:16:42 +08:00 |
|
lvleigang
|
a3da542b56
|
u8c封装接口
|
2024-09-04 16:16:35 +08:00 |
|
hecan
|
540cde8ca1
|
调整部门。职员，指标，如果根据编码查询存在则不保存也不更新，返回该编码已存在
|
2024-09-04 16:14:07 +08:00 |