FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,571 Commits 1 Branch 0 Tags
ca115ff337d29300479b53bc2cdd864fe08925c1
Commit Graph
1571 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王夏晖 ca115ff337 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!300
 2021-12-20 17:03:03 +08:00
王夏晖 28e5923544 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!299
 2021-12-20 17:02:18 +08:00
zhaokaiyao@91isoft.com ab3e3374b8 企标评价空指针 2021-12-20 15:42:30 +08:00
yuezhihang 09e7e2ffee 标准查询没有total问题修复 2021-12-20 13:51:57 +08:00
super_liu 56212b7beb Merge branch 'develop_master' into FOTON 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
 2021-12-18 13:59:23 +08:00
super_liu 545e5bba72 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!298
 2021-12-18 13:56:14 +08:00
super_liu 57b19f5c79 feat: There is no way the, iphone 2021-12-18 13:55:17 +08:00
super_liu e114b10ac5 feat: There is no way the, del only callback code 2021-12-17 16:46:07 +08:00
yuezhihang ce40aed7cb 企标制修订计划模块 2021-12-17 16:24:40 +08:00
zhaokaiyao@91isoft.com 20877855aa 国内外 发布日期查询 2021-12-17 16:11:37 +08:00
zhaokaiyao@91isoft.com e491589af9 为符合项导出的excel 忽略productId 2021-12-17 15:12:58 +08:00
yuezhihang 9856f73052 清单导出--》字段问题修复 2021-12-17 15:02:02 +08:00
zhaokaiyao@91isoft.com 904d7a993d 为符合项导出的excel 计划关闭时间去掉时分秒 2021-12-17 14:50:28 +08:00
王夏晖 efe197eb12 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!297
 2021-12-17 11:26:51 +08:00
yuezhihang 204a2c8225 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-17 11:16:12 +08:00
yuezhihang 773e33988e 征求意见流程--》导出功能完善 2021-12-17 11:16:02 +08:00
zj d282250b1a Merge remote-tracking branch 'origin/FOTON' into FOTON 2021-12-17 10:56:43 +08:00
zhaokaiyao@91isoft.com a8544607de 高级搜索 发布日期范围查询 2021-12-17 10:55:44 +08:00
zj 2302a13901 解决冲突 2021-12-17 10:55:36 +08:00
王夏晖 f5b42efb71 Merge branch 'develop_master' into 'FOTON' 
Merge branch 'develop_3' into 'develop_master'

See merge request LiuChao/foton-slrs-system-rest!296
 2021-12-17 10:53:33 +08:00
王夏晖 62bb294f09 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!295
 2021-12-17 10:53:16 +08:00
zj 4166e2cc64 Merge remote-tracking branch 'origin/FOTON' into FOTON 2021-12-17 10:52:11 +08:00
王夏晖 0983c5b741 Merge branch 'develop_3' into 'FOTON' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!294
 2021-12-17 10:50:00 +08:00
zhaokaiyao@91isoft.com 4f18df878c Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-16 20:49:46 +08:00
zhaokaiyao@91isoft.com 3bf802fd75 国内外删除提示 2021-12-16 20:47:45 +08:00
super_liu 9c6df264d6 Merge branch 'develop_master' into FOTON 2021-12-16 20:17:58 +08:00
super_liu ddbedc1b28 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!293
 2021-12-16 18:18:40 +08:00
super_liu 90d6c0d4cf feat: There is no way the, 2021-12-16 18:13:17 +08:00
yuezhihang 391169aeea 公开征求意见部分 的导出接口预备 以及 流程中上传附件数据预备 （后端自测完成 有数据回显需要前台从流程开始更改传输数据） 2021-12-16 18:07:54 +08:00
zhaokaiyao@91isoft.com 71354b944f 资料中心通过id查询 2021-12-16 17:43:00 +08:00
zhaokaiyao@91isoft.com e0f4eb3d0f 国内外查询总数的sql 2021-12-16 17:42:17 +08:00
yuezhihang 349c283db4 登陆人或责任人部门错误问题 已修复 （可能存在残留） 2021-12-16 16:56:53 +08:00
yuezhihang a5e00ef286 公开征求意见以及流程部分功能修复 2021-12-16 15:33:21 +08:00
zj 3db5b66721 Merge remote-tracking branch 'origin/FOTON' into FOTON 2021-12-16 14:05:26 +08:00
王夏晖 a757bd9b0d Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!292
 2021-12-16 14:04:47 +08:00
yuezhihang 4eda945927 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-16 11:03:17 +08:00
yuezhihang 13e373f148 新流程发起接口 2021-12-16 11:03:07 +08:00
zj a4a35fc38a Merge remote-tracking branch 'origin/FOTON' into FOTON 2021-12-16 10:55:33 +08:00
王夏晖 0e19635a56 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!291
 2021-12-16 10:54:32 +08:00
王夏晖 869021a681 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!290
 2021-12-16 10:52:57 +08:00
zhaokaiyao@91isoft.com 440f0323d6 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-16 10:40:59 +08:00
zhaokaiyao@91isoft.com a642c5eaa5 查询原始文件信息接口 2021-12-16 10:40:25 +08:00
zj c214c4d7a6 Merge remote-tracking branch 'origin/develop_master' into FOTON 2021-12-16 09:51:21 +08:00
zj 067558303a Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-16 09:49:41 +08:00
zj fef874c5ce 增加获取流程图片地址过滤 2021-12-16 09:48:16 +08:00
zj 4e32bb7ee5 Merge remote-tracking branch 'origin/FOTON' into FOTON 2021-12-16 09:09:04 +08:00
super_liu aec8010403 Merge remote-tracking branch 'origin/FOTON' into FOTON 2021-12-15 21:18:35 +08:00
super_liu f8309fdce0 feat: There is no way the 2021-12-15 21:17:53 +08:00
Superman_Main 9dc572e3d9 feat: There is no way the 2021-12-15 21:17:52 +08:00
Superman_Main 0877fb2df8 feat: There is no way the 2021-12-15 21:17:20 +08:00