FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
237 Commits 1 Branch 0 Tags
b3f9244345726b2c2b62b0f2e09fe36b4e52dae1
Commit Graph
237 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhaokaiyao@91isoft.com b3f9244345 修改了国内法规导出excl表单的字段 2021-07-22 10:58:22 +08:00
zhaokaiyao@91isoft.com 7618db7a47 ("/${restPath}/person/personCollect")添加收藏,查询收藏,取消收藏 2021-07-21 15:18:58 +08:00
zhaokaiyao@91isoft.com 706b6ce264 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-21 11:35:58 +08:00
zhaokaiyao@91isoft.com 5825d8793f 修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部 
添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员
添加getFirstInstitution()接口,返回机构第一级目录
 2021-07-21 11:30:44 +08:00
zhaokaiyao@91isoft.com 4cee0f6bf5 修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部 
添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员
添加getFirstInstitution()接口,返回机构第一级目录
 2021-07-21 10:03:49 +08:00
super_liu 7db2b79b63 feat: 首页标准发布 2021-07-19 16:29:52 +08:00
super_liu 21931a9455 feat: 标准库 2021-07-19 12:02:56 +08:00
super_liu 63181803aa feat: 标准库 2021-07-18 17:10:35 +08:00
super_liu 5efce6f2d1 feat: vpps model 添加树结构 2021-07-15 18:37:49 +08:00
super_liu 23e90a822c Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-07-15 17:16:11 +08:00
super_liu de97f459fd feat: 标准入库流程 带入 逻辑 2021-07-15 17:14:54 +08:00
duanwenbin 78b99accc9 提交树形结构代码 2021-07-14 16:17:50 +08:00
yinglong zhang 8aed75a8f0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-13 15:36:33 +08:00
yinglong zhang 35d86a7222 feat 未合规项整改 2021-07-13 15:36:17 +08:00
super_liu 8aa0d66d0e Merge branch 'develop_3' into 'develop_master' 
feat: 添加企业标准库 接口服务

See merge request !24
 2021-07-13 06:27:51 +00:00
super_liu 9930cbae9b feat: 添加企业标准库 接口服务 2021-07-13 14:25:06 +08:00
super_liu cdf0ecd04e Merge branch 'develop_3' into 'develop_master' 
feat: 标准库 详情 文件类 修改

See merge request !23
 2021-07-12 10:10:37 +00:00
duanwenbin 718e261ff6 提交本地工具-标准拆分缺失的编辑接口 2021-07-12 18:10:11 +08:00
super_liu 51ed1c269d feat: 标准库 详情 文件类 修改 2021-07-12 18:09:24 +08:00
super_liu a160d81c9e Merge branch 'develop_3' into 'develop_master' 
feat: 标准文本信息上传

See merge request !22
 2021-07-12 03:03:37 +00:00
super_liu f41d94bbd9 feat: 标准文本信息上传 2021-07-12 11:02:11 +08:00
super_liu b335387242 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !21
 2021-07-11 07:49:10 +00:00
super_liu 43434a68e0 feat: 标准库 2021-07-11 15:47:02 +08:00
super_liu 4cf827998b Merge branch 'develop_3' into 'develop_master' 
feat: 入库流程 属性字段对应

See merge request !20
 2021-07-10 07:52:58 +00:00
super_liu 48933b44dc feat: 入库流程 属性字段对应 2021-07-10 15:43:35 +08:00
super_liu a535f138d9 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库 体系树形结构等

See merge request !19
 2021-07-09 10:17:43 +00:00
super_liu c06cb07db6 feat: 标准库 体系树形结构等 2021-07-09 18:16:10 +08:00
yuezhihang 00798eb2b1 产品线 数据 2021-07-09 15:28:15 +08:00
yuezhihang aed855e336 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
 2021-07-09 14:33:21 +08:00
王夏晖 952c3ab02a Update application-dev.properties 2021-07-09 03:42:02 +00:00
zj 2ee918e1d0 add:关联ts_user表查询+分页 2021-07-09 11:38:19 +08:00
yinglong zhang 3b0fbb34d1 feat 改回注册中心配置 2021-07-09 11:05:46 +08:00
root ffe3b2b8c3 Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 2021-07-09 09:50:15 +08:00
root 5bbf8556f6 fetch:数据处理 2021-07-09 09:49:38 +08:00
super_liu 78d87640eb Merge branch 'develop_3' into 'develop_master' 
Develop 3  feat: 标准库 左侧树 相关 配置标准 更新记录相关等

See merge request !18
 2021-07-08 14:59:10 +00:00
super_liu 0842280775 feat: 标准库详情 更新记录 2021-07-08 22:56:50 +08:00
super_liu e067c8ae61 feat: 标准库 左侧树 相关 配置标准 相关等 2021-07-08 22:34:07 +08:00
yuezhihang 4b8aac9bc4 标准 发布搞 2021-07-08 21:04:18 +08:00
yuezhihang 0a5b8d8580 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-08 20:17:00 +08:00
zzy 04792ee931 add:分解单查询 2021-07-08 20:05:12 +08:00
zzy e998809767 add:分解单查询 2021-07-08 20:04:47 +08:00
yuezhihang dfc10e4b0f Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-08 19:38:54 +08:00
root 7fda1c196c fetch:我的板块改为二级菜单 2021-07-08 18:53:33 +08:00
root 142ff05355 fetch:我的板块bug 2021-07-08 16:58:00 +08:00
root e73e07d681 Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 2021-07-08 15:55:00 +08:00
duanwenbin 4bfbd48dc6 提交本地工具-标准比对的相关接口 2021-07-08 15:50:05 +08:00
root 9020a2782f Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 2021-07-08 15:46:53 +08:00
root 9432d1a2f4 fetch:我的模块数据 2021-07-08 15:46:19 +08:00
super_liu 4f7d1648db Merge branch 'develop_3' into 'develop_master' 
feat: 数据字典 树形结构

See merge request !17
 2021-07-08 06:20:39 +00:00
super_liu 521c81c8bb Merge branch 'develop_1' into 'develop_master' 
update:优化查询速度

See merge request !16
 2021-07-08 06:19:52 +00:00