FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,802 Commits 1 Branch 0 Tags
06c14bd8cd54af524f44094de2a83e25fd7839f5
Commit Graph
1802 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang b0b6a6f391 会议信息修改bug修复 2021-12-22 16:24:10 +08:00
yanyizhou f8c9ab1d55 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-12-22 15:09:05 +08:00
yuezhihang 5f5051bd2f 未符合项bug修复 --->新增支持查询责任部门 2021-12-22 14:03:11 +08:00
yuezhihang 8c72debb05 责任部门导出和日历修改 bug修复 2021-12-22 11:09:20 +08:00
王夏晖 a79b7cbb2f Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!311
 2021-12-21 20:48:33 +08:00
yuezhihang 5e1df05c6b Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-21 20:42:18 +08:00
yuezhihang 22cc39c0e2 标准化活动参会入会 2021-12-21 20:42:06 +08:00
super_liu 223008e42b Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!310
 2021-12-21 17:21:08 +08:00
super_liu 8b225fbb14 feat: There is no way the, 2021-12-21 17:01:48 +08:00
王夏晖 75d89f16d7 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!309
 2021-12-21 15:23:35 +08:00
super_liu 8ef5e27843 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!308
 2021-12-21 14:41:06 +08:00
super_liu 382f42b8e5 feat: There is no way the, 2021-12-21 14:39:06 +08:00
王夏晖 66afce65a4 Merge branch 'develop_master' into 'FOTON' 
项目清单查询

See merge request LiuChao/foton-slrs-system-rest!307
 2021-12-21 14:15:07 +08:00
yuezhihang 1d2fcd4a27 项目清单查询 2021-12-21 14:13:44 +08:00
王夏晖 3b0feb046d Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!306
 2021-12-21 11:06:46 +08:00
yuezhihang 3880e0c68f 标准维度选数据出现全空数据的问题 2021-12-21 11:05:26 +08:00
yuezhihang caed5e20a3 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-21 10:13:01 +08:00
yuezhihang d05f5eb388 法规清单人名回显问题 2021-12-21 10:12:55 +08:00
王夏晖 4bc1c92df8 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!305
 2021-12-20 20:29:41 +08:00
王夏晖 999f277c13 Merge branch 'develop_3' into 'develop_master' 
预警

See merge request LiuChao/foton-slrs-system-rest!304
 2021-12-20 20:28:58 +08:00
zhaokaiyao@91isoft.com 1432bdb520 预警 2021-12-20 20:26:51 +08:00
王夏晖 820bc2c519 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!303
 2021-12-20 20:25:35 +08:00
yuezhihang e8b84b3088 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-20 18:04:02 +08:00
yuezhihang 9d365878a0 标准维度流程 2021-12-20 18:03:51 +08:00
王夏晖 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