 zzy
|
0779f2c8e9
|
update：未符合整改项导出
|
2021-07-29 15:07:07 +08:00 |
|
|
zzy
|
80226d5cfb
|
update：修改清单信息
|
2021-07-29 11:14:47 +08:00 |
|
|
Wanghong
|
cacc66d5e7
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-07-28 18:10:28 +08:00 |
|
|
Wanghong
|
bf0f7b7f4c
|
修改未符合项模糊查询bug
|
2021-07-28 18:09:44 +08:00 |
|
|
zj
|
734a4e7421
|
update:解决车型项目库项目标号回显错误的BUG
|
2021-07-28 15:55:53 +08:00 |
|
|
zzy
|
6dc14af762
|
update：修改sql语句
|
2021-07-28 14:05:11 +08:00 |
|
|
zzy
|
b3630e8ad6
|
update：修复导出
|
2021-07-28 10:10:25 +08:00 |
|
|
Wanghong
|
2428b39e79
|
修改未符合项bug
|
2021-07-28 09:23:44 +08:00 |
|
|
zzy
|
0540325f35
|
update：修改标准查询
|
2021-07-27 17:04:30 +08:00 |
|
|
zzy
|
1007321491
|
update：标准征求意见增加字段
|
2021-07-27 15:55:01 +08:00 |
|
|
zzy
|
c3c69e87ef
|
update：清单增加字段
|
2021-07-27 09:20:27 +08:00 |
|
|
super_liu
|
6f286d6ca5
|
Merge branch 'develop_1' into 'develop_master'
update：清单修改，时间查询
See merge request !57
|
2021-07-27 00:58:31 +00:00 |
|
|
zzy
|
ad2b29f072
|
update：清单修改，时间查询
|
2021-07-26 17:57:44 +08:00 |
|
|
王夏晖
|
bcb0106983
|
Merge branch 'develop_1' into 'develop_master'
update：清单查询，增加字段
See merge request !55
|
2021-07-26 08:14:51 +00:00 |
|
|
zzy
|
404730d522
|
update：清单查询，增加字段
|
2021-07-26 14:53:51 +08:00 |
|
|
super_liu
|
cb48c13635
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !54
|
2021-07-26 03:12:53 +00:00 |
|
|
super_liu
|
ccfbc541d5
|
feat: 企业标准库 迁移2
|
2021-07-26 11:12:16 +08:00 |
|
|
super_liu
|
d210e218ba
|
feat: 标准属性字段 默认排序
|
2021-07-26 10:07:55 +08:00 |
|
|
super_liu
|
923a3505bf
|
Merge branch 'develop_3' into 'develop_master'
feat: 标准库MQ
See merge request !53
|
2021-07-26 01:51:52 +00:00 |
|
|
super_liu
|
2ba81296da
|
feat: 标准库MQ
|
2021-07-26 09:51:12 +08:00 |
|
|
super_liu
|
c608e52226
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !52
|
2021-07-25 12:50:49 +00:00 |
|
|
super_liu
|
8a1c2b39c3
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-25 20:44:40 +08:00 |
|
|
super_liu
|
8a263964f6
|
feat: 企业标准库 迁移1
|
2021-07-25 20:41:38 +08:00 |
|
|
王夏晖
|
f5ceeebbf6
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request !51
|
2021-07-24 01:49:13 +00:00 |
|
|
Wanghong
|
cf0d9f6c6d
|
修改条件查询标准涉及项目符合性清单BUG
|
2021-07-23 18:01:15 +08:00 |
|
|
Wanghong
|
f94fb9db0d
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-07-23 18:01:06 +08:00 |
|
|
Wanghong
|
a4e2dd227a
|
修改条件查询标准涉及项目符合性清单BUG
|
2021-07-23 18:00:24 +08:00 |
|
|
super_liu
|
25528d92a8
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !50
|
2021-07-23 08:03:18 +00:00 |
|
|
王夏晖
|
601799acf6
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request !49
|
2021-07-23 07:57:56 +00:00 |
|
|
zzy
|
1f57316d3e
|
update：解决冲突
|
2021-07-23 15:56:56 +08:00 |
|
|
zzy
|
33c71b10e8
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-07-23 15:56:18 +08:00 |
|
|
zj
|
84c8c949bb
|
update:优化sql one more time
|
2021-07-23 15:55:10 +08:00 |
|
|
zzy
|
3fb8bfafb9
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
|
2021-07-23 15:16:16 +08:00 |
|
|
zzy
|
06aa79e3f6
|
update：增加高级查询
|
2021-07-23 15:03:02 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
66f9763b96
|
添加了修改第三方链接排序接口
|
2021-07-23 15:00:47 +08:00 |
|
|
王夏晖
|
dc884c0162
|
Merge branch 'develop_1' into 'develop_master'
update:优化sql
See merge request !46
|
2021-07-23 06:56:07 +00:00 |
|
|
zj
|
8ec8db0437
|
update:优化sql
|
2021-07-23 14:51:45 +08:00 |
|
|
yuezhihang
|
8d1280d484
|
标准清单入库 bug修复
|
2021-07-23 12:51:27 +08:00 |
|
|
王夏晖
|
03723a1522
|
Merge branch 'develop_1' into 'develop_master'
update：回复配置文件
See merge request !44
|
2021-07-22 09:26:17 +00:00 |
|
|
zzy
|
c4e563081a
|
update：回复配置文件
|
2021-07-22 17:04:55 +08:00 |
|
|
王夏晖
|
454af6e305
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request !42
|
2021-07-22 08:32:12 +00:00 |
|
|
zzy
|
3cafbfbb6f
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
# adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
|
2021-07-22 16:25:23 +08:00 |
|
|
zzy
|
91c4dea4db
|
update:清单导出，增加编辑，修复bug
|
2021-07-22 16:10:53 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6c7baa65af
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-22 14:53:08 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2ca543d981
|
添加岗位时,设置操作时间为当前系统时间
|
2021-07-22 14:52:11 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b3f9244345
|
修改了国内法规导出excl表单的字段
|
2021-07-22 10:58:22 +08:00 |
|
|
yuezhihang
|
ae16a14ea1
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-07-22 10:26:14 +08:00 |
|
|
yuezhihang
|
2783e02b1e
|
链接新增bug 修复
|
2021-07-22 10:26:09 +08:00 |
|
|
super_liu
|
f840e2e79d
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !40
|
2021-07-21 11:15:31 +00:00 |
|
|
super_liu
|
7f874329a8
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-21 19:14:36 +08:00 |
|