 yuezhihang
|
aeb78eb36d
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-03 17:23:43 +08:00 |
|
|
yuezhihang
|
bcadf21d75
|
协会信息数据统计 导入导出 以及 导入公共方法完善
|
2022-03-03 17:23:35 +08:00 |
|
|
super_liu
|
ae26e35d3f
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标审批完入库后，入库人应为流程发起人
See merge request LiuChao/foton-slrs-system-rest!410
|
2022-03-03 16:08:21 +08:00 |
|
|
super_liu
|
13b603b526
|
feat: There is no way the, 企标审批完入库后，入库人应为流程发起人
|
2022-03-03 15:58:09 +08:00 |
|
|
yuezhihang
|
b9e440c92c
|
后端通用生成excel 以及 协会信息数据统计带数据导出
|
2022-03-03 15:26:42 +08:00 |
|
|
yuezhihang
|
48a0181942
|
评估结果 排序
|
2022-03-02 17:39:09 +08:00 |
|
|
yuezhihang
|
230d0eab32
|
项目合规评估 --- 查询条件 新增
|
2022-03-02 16:52:31 +08:00 |
|
|
yuezhihang
|
d2fd93450e
|
公用导出奥利给 只负责生成数据不负责校验
|
2022-03-02 16:41:43 +08:00 |
|
|
yuezhihang
|
4d7d5ddd0d
|
组织架构
|
2022-03-02 11:13:52 +08:00 |
|
|
yuezhihang
|
3c03a1659f
|
流程 批量导入数据
|
2022-03-01 18:01:13 +08:00 |
|
|
yuezhihang
|
9921c6aa9b
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-01 14:45:39 +08:00 |
|
|
yuezhihang
|
dbaf142f03
|
bug修复==》 表单内 3.1 和 部分3.2 bug修复
|
2022-03-01 14:45:32 +08:00 |
|
|
super_liu
|
1bec67965b
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 水印加深0.1
See merge request LiuChao/foton-slrs-system-rest!409
|
2022-03-01 13:50:08 +08:00 |
|
|
super_liu
|
bfd01ac605
|
feat: There is no way the, 水印加深0.1
|
2022-03-01 13:48:44 +08:00 |
|
|
yuezhihang
|
5316e6aeb3
|
282 bug 修复
|
2022-02-28 16:08:40 +08:00 |
|
|
yuezhihang
|
f2269904cd
|
流程 的 模板下载 和 excel 282 行 姓名支持拼音查询的bug修复
|
2022-02-28 16:06:35 +08:00 |
|
|
yuezhihang
|
7262b6974b
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-02-24 17:55:28 +08:00 |
|
|
yuezhihang
|
af11a626df
|
bug修复
|
2022-02-24 17:55:22 +08:00 |
|
|
super_liu
|
c0a967e125
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 国外被代替标准号 注掉 之前逻辑
See merge request LiuChao/foton-slrs-system-rest!408
|
2022-02-24 17:04:34 +08:00 |
|
|
super_liu
|
aaae03989b
|
feat: There is no way the, 国外被代替标准号 注掉 之前逻辑
|
2022-02-24 17:02:06 +08:00 |
|
|
super_liu
|
95a80b832c
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!407
|
2022-02-24 13:54:37 +08:00 |
|
|
super_liu
|
86e74d5539
|
feat: There is no way the, 被代替标准自动生成 及 详情显示
|
2022-02-24 13:52:52 +08:00 |
|
|
super_liu
|
76a487e857
|
feat: There is no way the, 月末 (逻辑和 月初 一样 月末需跑一次下整月 防止特殊原因导致遗漏)
|
2022-02-24 10:46:56 +08:00 |
|
|
super_liu
|
287c909d25
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标复审计划月初逻辑 改为 下整月
See merge request LiuChao/foton-slrs-system-rest!406
|
2022-02-23 09:08:39 +08:00 |
|
|
super_liu
|
85e90b378d
|
feat: There is no way the, 企标复审计划月初逻辑 改为 下整月
|
2022-02-23 09:05:59 +08:00 |
|
|
super_liu
|
fea30dc871
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, tree async
See merge request LiuChao/foton-slrs-system-rest!405
|
2022-02-22 17:21:21 +08:00 |
|
|
super_liu
|
183ba86528
|
feat: There is no way the, tree async
|
2022-02-22 17:18:18 +08:00 |
|
|
yuezhihang
|
7c271fa204
|
数据字典查询接口优化
|
2022-02-22 12:36:28 +08:00 |
|
|
super_liu
|
8fa99c5b30
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss tree auth
See merge request LiuChao/foton-slrs-system-rest!404
|
2022-02-21 17:48:33 +08:00 |
|
|
super_liu
|
5352684945
|
feat: There is no way the, buss tree auth
|
2022-02-21 17:44:29 +08:00 |
|
|
yuezhihang
|
c705648e3f
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-02-21 16:43:35 +08:00 |
|
|
yuezhihang
|
41dbca2772
|
项目合规评估 入库 操作
|
2022-02-21 16:43:29 +08:00 |
|
|
super_liu
|
6ba63d508c
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!403
|
2022-02-21 13:51:44 +08:00 |
|
|
super_liu
|
e766dfdb53
|
feat: There is no way the, 注掉 国内 技术系列逻辑
|
2022-02-21 12:31:34 +08:00 |
|
|
super_liu
|
099df97db4
|
feat: There is no way the, tree
|
2022-02-21 12:26:24 +08:00 |
|
|
super_liu
|
341dcb9d5a
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 角色标准数据权限体系优化 国内标准左侧树 加入技术体系 待完成
See merge request LiuChao/foton-slrs-system-rest!402
|
2022-02-18 17:52:13 +08:00 |
|
|
super_liu
|
020b1e6a3f
|
feat: There is no way the, 角色标准数据权限体系优化 国内标准左侧树 加入技术体系 待完成
|
2022-02-18 17:49:04 +08:00 |
|
|
yuezhihang
|
697f5722eb
|
日志模块 查询对象修改
|
2022-02-18 16:52:21 +08:00 |
|
|
yuezhihang
|
83ae8a029a
|
根据角色 查询用户
|
2022-02-18 16:50:04 +08:00 |
|
|
yuezhihang
|
278985f338
|
标准合规评估查询条件 精确变模糊
|
2022-02-17 19:01:48 +08:00 |
|
|
yuezhihang
|
0c282f3e4b
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-02-17 17:36:37 +08:00 |
|
|
yuezhihang
|
57a770254c
|
Merge remote-tracking branch 'origin/FOTON' into develop_master
|
2022-02-17 17:36:28 +08:00 |
|
|
super_liu
|
c6b36f72e1
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 新企标复审入库
See merge request LiuChao/foton-slrs-system-rest!401
|
2022-02-17 17:27:45 +08:00 |
|
|
yuezhihang
|
03e4f956d1
|
操作日志日期倒序
|
2022-02-17 17:14:25 +08:00 |
|
|
yuezhihang
|
584daa94b5
|
基础库 操作日志添加
|
2022-02-17 17:13:09 +08:00 |
|
|
2510220824
|
2c59302da4
|
update:增加统一前缀
|
2022-02-17 15:04:43 +08:00 |
|
|
super_liu
|
8e7e210d35
|
feat: There is no way the, 新企标复审入库
|
2022-02-17 14:48:26 +08:00 |
|
|
2510220824
|
4e722f17ef
|
update:操作类型接口
|
2022-02-17 14:38:40 +08:00 |
|
|
2510220824
|
97e82b0248
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java
|
2022-02-17 14:17:28 +08:00 |
|
|
2510220824
|
a6cee426de
|
update:操作日志查询、新增接口
|
2022-02-17 14:15:36 +08:00 |
|