 yanyizhou
|
446f8f54e9
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-06 18:29:25 +08:00 |
|
|
yanyizhou
|
912cda6762
|
配置管理 机构管理 查询加分页
|
2021-09-06 18:29:10 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
307e6ddd85
|
commit
|
2021-09-06 14:29:04 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
19c52a212b
|
解决企标高级搜索,putTime,issuTime,textStatusBuss失效的问题
|
2021-09-04 10:09:40 +08:00 |
|
|
yanyizhou
|
1f2d738ee3
|
机构管理--加筛选条件：姓名和邮箱
|
2021-09-03 17:24:59 +08:00 |
|
|
Mr.Z
|
0e8238267c
|
车型项目库的清单版本~~
|
2021-09-02 17:29:19 +08:00 |
|
|
Mr.Z
|
2e6edf615b
|
标准预警修改~~
|
2021-09-02 10:17:28 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
c60ba3c14e
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-31 21:39:44 +08:00 |
|
|
yuezhihang
|
4277e819f2
|
因排序导致无法去重
|
2021-08-31 16:12:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a843354794
|
预警标准时设itemsId为'-1'
更改唯一性约束
|
2021-08-31 14:47:54 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
8040cc0711
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-31 14:04:42 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
02dc65167e
|
对实施日期进行预警.更新对条款的预警,加入使用车型和责任工程师
|
2021-08-31 14:04:28 +08:00 |
|
|
yuezhihang
|
1ef143e71f
|
标准查询 标准号/标准姓名 ！！！
|
2021-08-31 10:49:04 +08:00 |
|
|
yuezhihang
|
7ad71e5e6a
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-30 17:50:50 +08:00 |
|
|
yuezhihang
|
900437039d
|
项目清单确认流程
|
2021-08-30 17:50:45 +08:00 |
|
|
super_liu
|
a57693fd39
|
Merge branch 'develop_master' into develop_migration
|
2021-08-30 15:11:00 +08:00 |
|
|
super_liu
|
99c32a2d7f
|
feat: There is no way the convert
|
2021-08-30 15:08:55 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2fb1faacfa
|
标准预警,标准文本状态自动更新
|
2021-08-30 09:48:35 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
913fc6e8f5
|
国内外标准详情 分解单日期格式和条款名称模糊查询
|
2021-08-29 19:17:41 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d66fcc1ad1
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-27 15:30:35 +08:00 |
|
|
yuezhihang
|
73588cac91
|
需求 解读流程 最细条目
|
2021-08-27 15:30:24 +08:00 |
|
|
Mr.Z
|
349fa7e499
|
标准拆分的批量删除与编辑~~
|
2021-08-27 15:30:24 +08:00 |
|
|
yanyizhou
|
87f3c15a7b
|
不一致项 查询 加standType
|
2021-08-27 15:30:23 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
c22db5b063
|
定时任务-修改文本状态
|
2021-08-27 15:24:32 +08:00 |
|
|
yuezhihang
|
003315dde8
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-27 14:44:07 +08:00 |
|
|
yuezhihang
|
9185ef2b6a
|
需求 解读流程 最细条目
|
2021-08-27 14:43:47 +08:00 |
|
|
Mr.Z
|
8cf4fec559
|
标准预警标准编号与名称跳页~~
|
2021-08-27 11:25:17 +08:00 |
|
|
Mr.Z
|
07bd24b7cf
|
标准拆分的批量删除与编辑~~
|
2021-08-26 20:44:51 +08:00 |
|
|
Mr.Z
|
6ada02e26d
|
Merge branch 'develop_master' into develop_1
|
2021-08-26 10:27:59 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6e0091f875
|
标准预警
|
2021-08-26 10:23:02 +08:00 |
|
|
yanyizhou
|
dbac199130
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-25 17:03:28 +08:00 |
|
|
yanyizhou
|
51055e0374
|
不一致项 查询 加standType
|
2021-08-25 17:02:59 +08:00 |
|
|
super_liu
|
590165a3c8
|
Merge branch 'develop_master' into develop_migration
|
2021-08-24 17:31:22 +08:00 |
|
|
super_liu
|
02a8b6c969
|
feat: There is no way the ES BUSS
|
2021-08-24 17:29:53 +08:00 |
|
|
Mr.Z
|
3d9952df59
|
Merge branch 'develop_master' into develop_1
|
2021-08-24 11:05:07 +08:00 |
|
|
Mr.Z
|
6e9cf7adf4
|
车型项目库数据传递bug修改~~
|
2021-08-24 11:01:32 +08:00 |
|
|
super_liu
|
6084f51bae
|
feat: There is no way the
|
2021-08-24 09:57:11 +08:00 |
|
|
Mr.Z
|
d94b03b05a
|
车型项目库回显bug(T_T)~~~~
|
2021-08-23 14:46:09 +08:00 |
|
|
yanyizhou
|
67dc9c829a
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-23 09:47:05 +08:00 |
|
|
yanyizhou
|
23365ffa16
|
标准拆分，拆分之后分解单里也有数据
|
2021-08-20 21:50:40 +08:00 |
|
|
super_liu
|
a242b9ac56
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the Buss and Convert
See merge request !120
|
2021-08-20 10:12:39 +00:00 |
|
|
super_liu
|
fe89ba9c60
|
feat: There is no way the Buss and Convert
|
2021-08-20 18:12:08 +08:00 |
|
|
yuezhihang
|
27e72dca2e
|
征求意见 数据
|
2021-08-20 17:49:34 +08:00 |
|
|
yuezhihang
|
e4c66d74a2
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-20 15:20:54 +08:00 |
|
|
yuezhihang
|
dcfedac4bf
|
标准征求意见流程汇总
|
2021-08-20 15:20:33 +08:00 |
|
|
super_liu
|
1363a5b5af
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !119
|
2021-08-20 07:06:16 +00:00 |
|
|
zhaokaiyao@91isoft.com
|
ebfde8bd52
|
定时标准预警
|
2021-08-20 14:33:29 +08:00 |
|
|
super_liu
|
d176d93d6b
|
feat: There is no way the Buss and Convert
|
2021-08-20 14:07:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
01d0da14e8
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
# adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
|
2021-08-18 16:42:28 +08:00 |
|
|
super_liu
|
5251cfdb71
|
Merge branch 'develop_master' into develop_3
|
2021-08-18 14:00:03 +08:00 |
|