FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,404 Commits 1 Branch 0 Tags
bb6ad10c5a28fa6aceebdc98fa11f68235fe86a6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wangxiahui@91isoft.com 7e03bc471d Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-05-23 14:37:30 +08:00
wangxiahui@91isoft.com 426728c359 update:用户数据同步修改1.开启定时任务，每天凌晨2点执行 2.已离职用户的数据过滤 2022-05-23 14:37:00 +08:00
wangxiahui@91isoft.com d4a936a750 update:修改ocr回调地址中的域名错误 2022-05-09 15:19:35 +08:00
王夏晖 39c77bd28e Merge branch 'develop_master' into 'FOTON' 
update:awc对接返回访问链接去掉用户信息

See merge request LiuChao/foton-slrs-system-rest!491
 2022-05-06 14:57:41 +08:00
wangxiahui@91isoft.com 4347f9d209 update:awc对接返回访问链接去掉用户信息 2022-05-06 14:55:28 +08:00
王夏晖 607a131fb5 Merge branch 'develop_3' into 'develop_master' 
标准新增以及编辑时 代替标准号在我的收藏中时,此标准也将插入我的收藏

See merge request LiuChao/foton-slrs-system-rest!394
 2022-01-27 09:34:52 +08:00
王夏晖 3ed58ba0db Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!393
 2022-01-26 14:55:24 +08:00
王夏晖 46fd4ef86c Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!390
 2022-01-24 18:27:56 +08:00
王夏晖 e24dd1ad6b Merge branch 'develop_3' into 'develop_master' 
企标库 ,代替标准号

See merge request LiuChao/foton-slrs-system-rest!389
 2022-01-24 16:10:49 +08:00
王夏晖 6d313ca819 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!388
 2022-01-24 15:25:19 +08:00
王夏晖 91e4a2c7b3 Merge branch 'develop_3' into 'develop_master' 
标准入库流程带入标准的目录体系:返回体系目录名称

See merge request LiuChao/foton-slrs-system-rest!386
 2022-01-22 19:15:19 +08:00
王夏晖 96c71c50a4 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!385
 2022-01-22 16:46:43 +08:00
王夏晖 5f18bf5235 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!384
 2022-01-21 13:48:42 +08:00
王夏晖 1d1beb5b89 Merge branch 'develop_3' into 'develop_master' 
查询字典类型 接口回滚

See merge request LiuChao/foton-slrs-system-rest!383
 2022-01-21 13:41:17 +08:00
王夏晖 896fcf4952 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!382
 2022-01-21 08:14:40 +08:00
王夏晖 42b8651544 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!380
 2022-01-19 19:34:32 +08:00
王夏晖 a602c5fc3f Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!378
 2022-01-19 15:16:16 +08:00
王夏晖 5d53017187 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!377
 2022-01-19 13:34:35 +08:00
王夏晖 fd13ba6253 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!376
 2022-01-18 23:03:26 +08:00
王夏晖 57bc0f0057 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!375
 2022-01-18 22:56:50 +08:00
王夏晖 728cd5d48f Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!372
 2022-01-17 15:54:17 +08:00
王夏晖 6421735d7b Merge branch 'develop_3' into 'develop_master' 
查询列表添加代替标准号 dtbzh字段

See merge request LiuChao/foton-slrs-system-rest!370
 2022-01-13 11:31:19 +08:00
王夏晖 5b6bb36588 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!367
 2022-01-11 13:40:07 +08:00
王夏晖 925ab6219e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!366
 2022-01-11 13:39:28 +08:00
王夏晖 46ba3ef7d3 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!365
 2022-01-07 17:02:27 +08:00
王夏晖 a662082db3 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!364
 2022-01-07 15:53:08 +08:00
王夏晖 b6f30bb322 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!362
 2022-01-07 15:52:39 +08:00
王夏晖 40fb539d7e Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!361
 2022-01-07 10:57:14 +08:00
王夏晖 32e78adaab Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!360
 2022-01-07 10:33:54 +08:00
王夏晖 3f6cb25ed7 Merge branch 'develop_3' into 'develop_master' 
企标详情  属性字典查询为空时,使用其本身数值

See merge request LiuChao/foton-slrs-system-rest!359
 2022-01-07 10:33:37 +08:00
王夏晖 853821bd45 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!357
 2022-01-06 17:40:06 +08:00
王夏晖 d678c4bcc8 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!355
 2022-01-06 15:35:12 +08:00
王夏晖 56b4f4e5c9 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!354
 2022-01-06 01:06:49 +08:00
王夏晖 ed695393f3 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!353
 2022-01-06 01:06:33 +08:00
王夏晖 a02d0657a0 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!350
 2022-01-05 08:57:10 +08:00
王夏晖 62072ceeca Merge branch 'develop_3' into 'develop_master' 
预警期限为12个月

See merge request LiuChao/foton-slrs-system-rest!349
 2022-01-05 08:56:17 +08:00
王夏晖 4b2b0bc865 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!348
 2022-01-04 16:45:56 +08:00
王夏晖 7e33b383a7 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!347
 2021-12-31 16:14:02 +08:00
王夏晖 14fb6c1071 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!346
 2021-12-31 16:13:44 +08:00
王夏晖 eba2ea008a Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!344
 2021-12-30 19:32:47 +08:00
王夏晖 c699e92f94 Merge branch 'develop_3' into 'develop_master' 
企业标准类别

See merge request LiuChao/foton-slrs-system-rest!343
 2021-12-30 19:32:04 +08:00
王夏晖 5d66ea8b92 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!342
 2021-12-30 14:38:32 +08:00
王夏晖 5aff3678c9 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!340
 2021-12-30 09:07:25 +08:00
王夏晖 02b62fdaa1 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!339
 2021-12-30 09:07:06 +08:00
王夏晖 faa18b178e Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!336
 2021-12-29 14:55:15 +08:00
王夏晖 cab273dae4 Merge branch 'develop_3' into 'develop_master' 
标准号查询总数与数据数量不一致

See merge request LiuChao/foton-slrs-system-rest!335
 2021-12-29 14:54:58 +08:00
王夏晖 4b72908b9e Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!334
 2021-12-29 13:46:58 +08:00
王夏晖 d5cb35f5f5 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!332
 2021-12-29 09:11:33 +08:00
王夏晖 9c39c5e663 Merge branch 'develop_3' into 'develop_master' 
根据标准id查询存在分解单的文本类型

See merge request LiuChao/foton-slrs-system-rest!331
 2021-12-29 09:11:17 +08:00
王夏晖 915fcac514 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!330
 2021-12-27 18:55:58 +08:00
王夏晖 ccfa63fc2a Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!328
 2021-12-27 16:34:49 +08:00
王夏晖 424b84a7fb Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!327
 2021-12-27 16:34:21 +08:00
王夏晖 575a50a399 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!326
 2021-12-27 16:14:57 +08:00
王夏晖 6f455ea0f1 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!325
 2021-12-27 11:15:59 +08:00
王夏晖 2c9ea4b182 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!323
 2021-12-25 09:33:39 +08:00
王夏晖 56c7b5d98e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!322
 2021-12-25 09:33:25 +08:00
王夏晖 8c491a7dd8 Merge branch 'develop_3' into 'FOTON' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!321
 2021-12-25 09:33:08 +08:00
王夏晖 afc6ab860c Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!320
 2021-12-24 10:31:02 +08:00
王夏晖 0e904d7b53 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!316
 2021-12-23 15:06:57 +08:00
王夏晖 69f6708e56 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!315
 2021-12-22 19:24:56 +08:00
王夏晖 7d6a2be540 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request LiuChao/foton-slrs-system-rest!314
 2021-12-22 19:24:29 +08:00
王夏晖 d99b9cfc7c Merge branch 'develop_3' into 'develop_master' 
国内外标准代替标准号查询

See merge request LiuChao/foton-slrs-system-rest!313
 2021-12-22 19:23:48 +08:00
王夏晖 8d52744eb7 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!312
 2021-12-22 16:54:11 +08:00
王夏晖 a79b7cbb2f Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!311
 2021-12-21 20:48:33 +08:00
王夏晖 75d89f16d7 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!309
 2021-12-21 15:23:35 +08:00
王夏晖 66afce65a4 Merge branch 'develop_master' into 'FOTON' 
项目清单查询

See merge request LiuChao/foton-slrs-system-rest!307
 2021-12-21 14:15:07 +08:00
王夏晖 3b0feb046d Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!306
 2021-12-21 11:06:46 +08:00
王夏晖 4bc1c92df8 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!305
 2021-12-20 20:29:41 +08:00
王夏晖 999f277c13 Merge branch 'develop_3' into 'develop_master' 
预警

See merge request LiuChao/foton-slrs-system-rest!304
 2021-12-20 20:28:58 +08:00
王夏晖 820bc2c519 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!303
 2021-12-20 20:25:35 +08:00
王夏晖 ca115ff337 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!300
 2021-12-20 17:03:03 +08:00
王夏晖 28e5923544 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!299
 2021-12-20 17:02:18 +08:00
王夏晖 efe197eb12 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!297
 2021-12-17 11:26:51 +08:00
王夏晖 f5b42efb71 Merge branch 'develop_master' into 'FOTON' 
Merge branch 'develop_3' into 'develop_master'

See merge request LiuChao/foton-slrs-system-rest!296
 2021-12-17 10:53:33 +08:00
王夏晖 62bb294f09 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!295
 2021-12-17 10:53:16 +08:00
王夏晖 0983c5b741 Merge branch 'develop_3' into 'FOTON' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!294
 2021-12-17 10:50:00 +08:00
王夏晖 a757bd9b0d Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!292
 2021-12-16 14:04:47 +08:00
王夏晖 0e19635a56 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!291
 2021-12-16 10:54:32 +08:00
王夏晖 869021a681 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!290
 2021-12-16 10:52:57 +08:00
王夏晖 c1ee44b19f Merge branch 'develop_master' into 'FOTON' 
拆分和ocr查询文件出错问题

See merge request LiuChao/foton-slrs-system-rest!286
 2021-12-15 16:17:53 +08:00
王夏晖 4fa4854e55 Merge branch 'develop_master' into 'FOTON' 
工作组

See merge request LiuChao/foton-slrs-system-rest!285
 2021-12-15 11:22:57 +08:00
王夏晖 19cfb7c27f Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!284
 2021-12-15 11:06:33 +08:00
王夏晖 2b7c98acee Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!283
 2021-12-15 09:16:47 +08:00
王夏晖 0964813f89 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!282
 2021-12-15 09:16:25 +08:00
王夏晖 1c2648e526 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!278
 2021-12-09 19:37:15 +08:00
王夏晖 304bebc284 Merge branch 'develop_3' into 'develop_master' 
预警导出 和 定时任务

See merge request LiuChao/foton-slrs-system-rest!277
 2021-12-09 19:36:43 +08:00
王夏晖 751448384a Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!275
 2021-12-09 13:33:10 +08:00
王夏晖 0197e1b17f Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!273
 2021-12-07 20:13:41 +08:00
王夏晖 17feda6305 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!271
 2021-12-06 18:12:38 +08:00
王夏晖 359a384c70 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!270
 2021-12-06 18:11:09 +08:00
王夏晖 445d172e62 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!269
 2021-12-05 21:08:42 +08:00
王夏晖 ffde83f71e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!268
 2021-12-05 21:08:16 +08:00
王夏晖 618516a7cd Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!267
 2021-12-02 21:16:45 +08:00
王夏晖 c1e1f8a495 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!266
 2021-12-02 21:16:11 +08:00
王夏晖 a0924c6893 Merge branch 'origin/Three' into 'develop_master' 
Origin/three

See merge request LiuChao/foton-slrs-system-rest!265
 2021-12-02 10:49:56 +08:00
王夏晖 d77dd97b2d Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!264
 2021-12-01 20:55:00 +08:00
王夏晖 e7302f306d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!263
 2021-12-01 20:54:21 +08:00
王夏晖 737c0dd65b Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!262
 2021-12-01 20:53:15 +08:00
王夏晖 27fa76d77c Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!259
 2021-11-30 22:50:29 +08:00
王夏晖 bc4529bf03 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!258
 2021-11-30 22:49:46 +08:00