 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 |
|
|
王夏晖
|
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 |
|
|
zhaokaiyao@91isoft.com
|
6b914c1430
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-18 17:21:43 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a125490d19
|
企业标准导出加入白名单
|
2021-10-18 17:21:22 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
60fd2eb999
|
抽出方法
|
2021-10-18 17:13:43 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
acbece6b2a
|
机构树形结构 不采用用递归查询数据库
|
2021-10-18 16:46:24 +08:00 |
|
|
super_liu
|
3811b5f682
|
feat: There is no way the
|
2021-10-18 14:00:04 +08:00 |
|
|
super_liu
|
d36aa25397
|
feat: There is no way the
|
2021-10-18 12:51:25 +08:00 |
|
|
super_liu
|
e4b69635be
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the user jwt
See merge request LiuChao/foton-slrs-system-rest!206
|
2021-10-18 12:45:52 +08:00 |
|
|
super_liu
|
91ff42cb12
|
feat: There is no way the user jwt
|
2021-10-18 12:45:02 +08:00 |
|
|
super_liu
|
8317333e96
|
feat: There is no way the
|
2021-10-18 10:37:44 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4286ae309c
|
标准excl导入
|
2021-10-17 19:59:00 +08:00 |
|
|
王夏晖
|
ea6e89c2bd
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!205
|
2021-10-17 19:58:05 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7358e84b82
|
sql优化,保留标准类别 standSortShow
|
2021-10-17 19:50:47 +08:00 |
|
|
王夏晖
|
1aef6454ab
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!204
|
2021-10-17 18:44:15 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
dba0c2e86a
|
附件下载接口加入白名单
|
2021-10-17 18:43:31 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b99983e910
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-17 18:41:13 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b790264f77
|
导入标准信息excl导出工具
|
2021-10-17 18:40:53 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
785ef90acd
|
sql优化
|
2021-10-17 18:39:57 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
33254f05f8
|
模块结构单元,查询
|
2021-10-17 16:12:23 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
9b5bf72fad
|
文件后缀大写
|
2021-10-17 14:26:44 +08:00 |
|
|
2510220824
|
a68d9c9e9d
|
add：修改pcms数据下发接口，统一访问前缀
|
2021-10-16 09:46:26 +08:00 |
|
|
2510220824
|
89116af8bf
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-10-16 09:34:08 +08:00 |
|
|
2510220824
|
8b479fca0c
|
add:修改用户获取权限，修改pcms数据同步
|
2021-10-16 09:33:48 +08:00 |
|
|
super_liu
|
c25f07db08
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!203
|
2021-10-15 14:52:44 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ffa894865c
|
接口拦截白名单
|
2021-10-15 14:48:38 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
8ef4f22e24
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-14 17:11:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
fec7245ec1
|
添加导出为excl 接口进白名单
|
2021-10-14 17:11:15 +08:00 |
|
|
super_liu
|
aa614a27cf
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the add white list
See merge request LiuChao/foton-slrs-system-rest!202
|
2021-10-14 16:27:59 +08:00 |
|
|
super_liu
|
042e6d12a5
|
Merge branch 'develop_master' into develop_migration
# Conflicts:
# adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
|
2021-10-14 16:27:22 +08:00 |
|
|
super_liu
|
28391e6cc2
|
feat: There is no way the add white list
|
2021-10-14 16:18:51 +08:00 |
|
|
王夏晖
|
f6836b0615
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!201
|
2021-10-14 15:14:10 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f1ef403e56
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-14 15:11:16 +08:00 |
|