FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,141 Commits 1 Branch 0 Tags
869bcdbad8527ec39f125e534eb0917132fcdbf2
Commit Graph
1141 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu 869bcdbad8 feat: There is no way the 2021-11-03 13:00:33 +08:00
super_liu 8af54bab9c Merge remote-tracking branch 'origin/develop_migration' into develop_migration 2021-11-01 17:59:49 +08:00
super_liu cab90f06ee feat: There is no way the,Laws 2021-11-01 17:59:24 +08:00
super_liu 78b458a361 Merge branch 'develop_master' into develop_migration 2021-11-01 09:57:05 +08:00
super_liu f54c8ea63b feat: There is no way the,laws 2021-11-01 09:43:13 +08:00
super_liu 4b1f6503e6 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, LAWS

See merge request LiuChao/foton-slrs-system-rest!212
 2021-10-30 21:08:29 +08:00
super_liu 6f7e92f686 feat: There is no way the, LAWS 2021-10-30 21:06:07 +08:00
super_liu 495f3c72ee feat: There is no way the 2021-10-30 12:42:25 +08:00
super_liu 148cdd5d42 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!211
 2021-10-30 00:56:26 +08:00
super_liu 1928ae8868 Merge branch 'develop_master' into develop_migration 2021-10-30 00:55:32 +08:00
super_liu 831f8d321a feat: There is no way the 2021-10-29 23:53:33 +08:00
yuezhihang 539cf47101 清单 流程回退 2021-10-29 14:02:47 +08:00
super_liu 62c18594db feat: There is no way the Laws 2021-10-28 18:10:31 +08:00
yuezhihang 0d18758178 项目评估流程标准维度-查询数据来源修复 2021-10-27 13:47:29 +08:00
yuezhihang 9ec34d5125 Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-10-27 13:39:58 +08:00
yuezhihang d02b73e2dd 标准库查询 和 流程发起界面查询 做了一个标志位的区分 目的是为了提高标准库的查询速度 2021-10-27 13:39:07 +08:00
super_liu 2504cac460 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-27 13:36:09 +08:00
super_liu c2e7b589d2 feat: There is no way the 2021-10-27 13:35:51 +08:00
yuezhihang a675e374bc 清单 流程回退 2021-10-27 09:38:56 +08:00
yuezhihang 23e70eba5b Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-25 15:10:04 +08:00
yuezhihang 59a7702e27 流程最新的发起Key 2021-10-25 15:09:55 +08:00
super_liu 7dcfe2dd03 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!210
 2021-10-25 14:06:41 +08:00
super_liu ac60a29630 feat: There is no way the 2021-10-25 14:05:28 +08:00
super_liu 055c562a99 Merge branch 'develop_master' into develop_migration 2021-10-25 12:01:46 +08:00
super_liu e7b2873362 feat: There is no way the 2021-10-25 11:55:32 +08:00
super_liu 89b4bfdd8d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!209
 2021-10-22 18:02:44 +08:00
super_liu 3cd41c45d7 feat: There is no way the, TO optimize the query 2021-10-22 17:53:11 +08:00
super_liu 48c3da1bae Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-22 17:03:46 +08:00
super_liu 1918e0da78 feat: There is no way the, TO optimize the query 2021-10-22 17:03:29 +08:00
super_liu c604ad2461 feat: There is no way the 2021-10-22 16:04:25 +08:00
super_liu 9eff2340a2 feat: There is no way the, TO optimize the query 2021-10-22 15:50:07 +08:00
zhaokaiyao@91isoft.com ed1762a7ec 标准发布日期查询 2021-10-21 18:25:14 +08:00
zhaokaiyao@91isoft.com 0ee4f63614 项目清单->项目经理 2021-10-21 13:51:27 +08:00
zhaokaiyao@91isoft.com 5c743e92c0 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-20 21:30:48 +08:00
zhaokaiyao@91isoft.com 4b30022ae5 标准excl导入 2021-10-20 21:30:36 +08:00
zhaokaiyao@91isoft.com 13332aaaa3 车型项目,PCMS组织信息,模块结构同步数据返回值修改,以及车型项目json重写 2021-10-20 21:30:02 +08:00
王夏晖 d8053efe8e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!207
 2021-10-20 15:51:05 +08:00
zhaokaiyao@91isoft.com 4ebe597ed4 Merge remote-tracking branch 'origin/develop_master' into develop_3 
# Conflicts:
#	adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
 2021-10-20 14:53:46 +08:00
zhaokaiyao@91isoft.com bef55f395a TODO模块单元树结构 2021-10-20 14:52:07 +08:00
zhaokaiyao@91isoft.com f6508c6e1a TODO标准excl导入 2021-10-20 14:51:05 +08:00
zhaokaiyao@91isoft.com 7b87743f9f TODO树形结构Hash 2021-10-20 14:49:51 +08:00
2510220824 900bcb9c14 add:福田生产环境配置 2021-10-20 14:36:20 +08:00
zhaokaiyao@91isoft.com ad91f84dfb 当前参数为标准类别时需要输入的code为name值 2021-10-20 14:33:21 +08:00
zhaokaiyao@91isoft.com d09cdb1d42 通过id绑定责任工程师和责任部门名称 2021-10-20 11:24:49 +08:00
zhaokaiyao@91isoft.com 740db92f90 commit 2021-10-19 17:58:11 +08:00
zhaokaiyao@91isoft.com f74da3d65d 查询机构人员,模糊查询,不需要id 2021-10-19 17:21:12 +08:00
zhaokaiyao@91isoft.com 8d522a4304 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-19 16:50:06 +08:00
zhaokaiyao@91isoft.com 4d1876b8c4 岗位配置模糊查询分页 2021-10-19 16:49:48 +08:00
2510220824 dba3ce87af Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-19 16:18:34 +08:00
2510220824 59c8f0f60b add:优化机构管理人员查询，不传机构就查全部 2021-10-19 16:18:11 +08:00