FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
711 Commits 1 Branch 0 Tags
71aba6aa2d8eeb6f18e977e92b01f60e62248e82
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang 65a7e634d4 分界单进入之前先删除 2021-08-24 17:14:20 +08:00
yuezhihang 78dbd37f03 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-08-24 15:34:27 +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
yuezhihang 019ca93736 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-19 16:51:11 +08:00
yuezhihang 66edfd1afc 清单 附件回显 2021-08-19 16:51:03 +08:00
yuezhihang b7589984e8 清单 流程回退 2021-08-19 10:51:37 +08:00
yuezhihang 7d18b3ff7c Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-19 10:41:20 +08:00
yuezhihang cdb3a9ccd4 bug修复 !!! 2021-08-19 09:25:29 +08:00
yuezhihang 508c292200 配置文件 2021-08-18 15:15:06 +08:00
yuezhihang af1ffe9313 解读入库 2021-08-18 14:44:27 +08:00
yuezhihang 39561c91d2 代码部分恢复 2021-08-18 14:38:00 +08:00
yuezhihang f353328bce Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-17 17:51:44 +08:00
yuezhihang 7303f11043 解读入库 2021-08-17 17:51:38 +08:00
yuezhihang 8028002033 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-17 16:18:45 +08:00
yuezhihang 535c4f47c4 清单！！！ 2021-08-17 16:18:38 +08:00
yuezhihang 0529b40897 试图上传 2021-08-17 09:50:23 +08:00
yuezhihang 690d86a4b8 项目查询以及代码精简 2021-08-17 09:37:46 +08:00
yuezhihang fbefe71f1c 评估结果 2021-08-16 15:43:26 +08:00
yuezhihang 86db5270e4 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-16 15:12:54 +08:00
yuezhihang 5bbc0e175f Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-16 14:57:44 +08:00
yuezhihang 99d5706184 解读入库 2021-08-16 14:57:34 +08:00
yuezhihang 133f55d162 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-13 18:28:34 +08:00
yuezhihang 44a24c23b1 项目维度 筛选标准 2021-08-13 18:28:28 +08:00
yuezhihang c660c36d40 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-13 16:44:17 +08:00
yuezhihang 699b1ef9c4 车型项目库查询bug 2021-08-13 16:44:09 +08:00
yuezhihang 39c08ecb81 发版配置 2021-08-13 09:15:01 +08:00
yuezhihang 3327223c25 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-13 09:06:16 +08:00
yuezhihang 9f0ed13874 合规评估项目数据过滤 2021-08-12 18:08:29 +08:00
yuezhihang 5254f397b8 项目评估流程 2021-08-12 18:00:46 +08:00
yuezhihang 7d4dcf561a 查询总数 错误bug 2021-08-12 16:22:36 +08:00
yuezhihang 514bf18667 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-12 14:54:01 +08:00
yuezhihang 3c27f20db3 修改分解单状态 2021-08-12 14:53:54 +08:00
yuezhihang f43ac650e0 标准合规评估流程 产品线不显示bug修复 2021-08-12 09:29:24 +08:00
yuezhihang 0326e66b54 启动bug修复 2021-08-12 09:13:06 +08:00
yuezhihang cdf9e16f1d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-12 09:06:22 +08:00
yuezhihang 440bb7d038 标准总数返回 
！！！！！
 2021-08-11 14:23:49 +08:00
yuezhihang 8c92abab31 过滤数据！！！ 2021-08-11 14:23:49 +08:00
yuezhihang def09cd38a 标准总数返回 
！！！！！
 2021-08-11 13:39:25 +08:00
yuezhihang adb039fa98 过滤数据！！！ 2021-08-11 13:39:20 +08:00
yuezhihang fb860e347d 解读入库 2021-08-10 17:57:03 +08:00
yuezhihang 90c39fab34 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-10 17:44:56 +08:00
yuezhihang e52f316a59 标准总数返回 
！！！！！
 2021-08-10 14:49:44 +08:00
yuezhihang 1218c4633a 代码合并 2021-08-09 17:58:19 +08:00
yuezhihang ca80dd9feb Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-08-09 17:55:11 +08:00
yuezhihang 3dd392b411 过滤数据！！！ 2021-08-09 17:52:01 +08:00
yuezhihang 1b8884fe75 车型项目库！ 2021-08-09 11:07:26 +08:00
yuezhihang 11ef32d698 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-08 17:37:45 +08:00
yuezhihang 313251dbbd Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-08 17:37:33 +08:00
yuezhihang 79113cd47a Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-08 15:44:08 +08:00
yuezhihang 32f7678427 ky 上传文件类型限制！！！ 2021-08-08 10:41:26 +08:00
yuezhihang b618714246 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-06 14:07:29 +08:00
yuezhihang 3df07924e8 标准解读流程 over！ 2021-08-06 14:07:22 +08:00
yuezhihang 82b72b191d 解读入库 2021-08-05 14:51:45 +08:00
yuezhihang 78ec0a08c7 发版配置更新 2021-08-05 09:24:51 +08:00
yuezhihang a2bd01dd5e 标准解读流程入库+ 合并分支 2021-08-05 09:05:30 +08:00
yuezhihang 639dd56700 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-05 09:04:09 +08:00
yuezhihang 9a5117f8e8 标准 拆分加文本状态 Map对应的 酌情添加 2021-08-03 15:06:20 +08:00
yuezhihang 2f12561caf 本人意见显示在最上面 2021-08-03 14:44:09 +08:00
yuezhihang 6f654406fd 征求意见流程-----加按钮判断权限接口 2021-08-03 13:56:33 +08:00
yuezhihang 65f7689dbc 征求意见修改 2021-08-02 15:17:44 +08:00
yuezhihang cf6e3ae601 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-02 13:45:17 +08:00
yuezhihang a3729263a8 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-30 18:02:22 +08:00
yuezhihang 343913c799 标准清单入库 bug修复 2021-07-30 15:20:56 +08:00
yuezhihang 46a577ab7f Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-30 13:43:13 +08:00
yuezhihang f9ee8ca41c 角色配置数据权限 bug修复 和 角色新增配置初始权限bug修复 2021-07-30 13:43:06 +08:00
yuezhihang 99321d38de 角色配置数据权限 bug修复 2021-07-30 09:57:51 +08:00
yuezhihang 589b31aa4d 注掉部分超哥代码 使程序先跑起来 2021-07-30 09:32:24 +08:00
yuezhihang a017d3acd6 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-29 15:22:23 +08:00
yuezhihang 534caf3bdb 政策状态修改 ！！！ 查询bug修复 2021-07-29 15:21:53 +08:00
yuezhihang 60dbb8faeb 配置中新 bug修复 和 角色管理bug修复 2021-07-29 14:02:40 +08:00
yuezhihang af1c3227f6 项目库 1 2021-07-29 10:13:27 +08:00
yuezhihang cabdf7a712 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
 2021-07-29 09:42:14 +08:00
yuezhihang 5366e15b4b Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-29 09:39:42 +08:00
yuezhihang a7c7142789 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-29 09:36:45 +08:00
yuezhihang f862fbf2cd Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-28 10:45:28 +08:00
yuezhihang af86c48161 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-26 15:52:28 +08:00
yuezhihang 8d1280d484 标准清单入库 bug修复 2021-07-23 12:51:27 +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
yuezhihang b20e1480e3 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-21 16:41:42 +08:00
yuezhihang 3595ea2aa3 标准清单入库 bug修复 2021-07-21 16:41:37 +08:00
yuezhihang 310cdf9473 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
 2021-07-21 14:07:53 +08:00
yuezhihang 1ceee2f1bf Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-21 10:52:26 +08:00
yuezhihang 7d890e7fcd 评估流程 2021-07-21 10:52:22 +08:00
yuezhihang b564ff964a Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-19 14:15:26 +08:00
yuezhihang 8f6bdf4fe8 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-19 14:14:17 +08:00
yuezhihang 299e69b383 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-16 16:05:50 +08:00
yuezhihang 22e5bb519c Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-16 14:41:45 +08:00
yuezhihang 2b3bcae6f2 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-16 14:39:25 +08:00
yuezhihang f398d6a245 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-15 17:37:30 +08:00
yuezhihang f96bbb6082 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-15 16:23:34 +08:00
yuezhihang d944ad54d7 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-13 10:34:16 +08:00
yuezhihang 00798eb2b1 产品线 数据 2021-07-09 15:28:15 +08:00
yuezhihang aed855e336 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
 2021-07-09 14:33:21 +08:00
yuezhihang 4b8aac9bc4 标准 发布搞 2021-07-08 21:04:18 +08:00
yuezhihang 0a5b8d8580 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-08 20:17:00 +08:00
yuezhihang dfc10e4b0f Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-08 19:38:54 +08:00
yuezhihang bee6ef8a8a Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-08 14:15:16 +08:00