FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,435 Commits 1 Branch 0 Tags
bdf1692e62a67fd7410feb592f7c50cebc95cb33
Commit Graph
61 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王夏晖 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
王夏晖 cd33a3b4bb Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!257
 2021-11-30 19:10:29 +08:00
王夏晖 878bc07e61 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!256
 2021-11-30 19:09:28 +08:00
王夏晖 104fd2656a Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!250
 2021-11-24 12:01:21 +08:00
王夏晖 1ef5a5fc38 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!249
 2021-11-23 21:43:37 +08:00
王夏晖 36c91409fa Merge branch 'develop_3' into 'develop_master' 
commit

See merge request LiuChao/foton-slrs-system-rest!248
 2021-11-23 21:40:38 +08:00
王夏晖 27bf478f35 Merge branch 'develop_3' into 'develop_master' 
匹配文件id和文件路径

See merge request LiuChao/foton-slrs-system-rest!232
 2021-11-13 09:36:03 +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
王夏晖 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
王夏晖 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
王夏晖 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
王夏晖 5cd66b338c Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!200
 2021-10-14 14:43:20 +08:00
王夏晖 9d36b3fa21 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request LiuChao/foton-slrs-system-rest!193
 2021-10-11 14:32:12 +08:00
王夏晖 60060cce55 Merge branch 'develop_master' into 'dev_wangxiahui' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!185
 2021-09-28 18:21:07 +08:00
王夏晖 215653505b Merge branch 'develop_3' into 'develop_master' 
分解单->关联条款

See merge request LiuChao/foton-slrs-system-rest!178
 2021-09-23 08:36:52 +08:00
王夏晖 e405a811b8 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!150
 2021-09-04 09:50:49 +08:00
王夏晖 79ca8606f7 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !104
 2021-08-11 05:46:41 +00:00
王夏晖 d7ed47a58f Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !99
 2021-08-09 09:11:47 +00:00
王夏晖 b989b6c7a3 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !96
 2021-08-08 03:02:43 +00:00
王夏晖 db69ac1f13 Update application.properties 2021-08-05 09:46:55 +00:00
王夏晖 2344ccfda2 Update application-dev.properties 2021-08-02 05:40:33 +00:00
王夏晖 4148f1bf6b Update application.properties 2021-08-02 05:38:46 +00:00
王夏晖 0cbc935da1 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !85
 2021-07-30 09:19:22 +00:00
王夏晖 9c9faf0ded Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !79
 2021-07-30 03:32:39 +00:00
王夏晖 0d2ac245b2 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !76
 2021-07-30 01:01:28 +00:00
王夏晖 de1fe704a8 Update application-dev.properties 2021-07-28 14:25:50 +00:00
王夏晖 a5d0229b5b Update application-dev.properties 2021-07-28 09:17:14 +00:00
王夏晖 a991f1550c Merge branch 'develop_1' into 'develop_master' 
update：修改sql语句

See merge request !65
 2021-07-28 06:18:22 +00:00
王夏晖 e237170f61 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !64
 2021-07-28 02:49:56 +00:00
王夏晖 385870df42 Merge branch 'develop_1' into 'develop_master' 
update：修改标准查询

See merge request !62
 2021-07-27 09:30:09 +00:00
王夏晖 7dbd402cb0 Merge branch 'develop_1' into 'develop_master' 
update：标准征求意见增加字段

See merge request !61
 2021-07-27 08:29:44 +00:00
王夏晖 d5ed912644 Merge branch 'develop_1' into 'develop_master' 
update：清单增加字段

See merge request !60
 2021-07-27 07:41:14 +00:00
王夏晖 bcb0106983 Merge branch 'develop_1' into 'develop_master' 
update：清单查询，增加字段

See merge request !55
 2021-07-26 08:14:51 +00:00
王夏晖 f5ceeebbf6 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !51
 2021-07-24 01:49:13 +00:00
王夏晖 601799acf6 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !49
 2021-07-23 07:57:56 +00:00
王夏晖 dc884c0162 Merge branch 'develop_1' into 'develop_master' 
update:优化sql

See merge request !46
 2021-07-23 06:56:07 +00:00
王夏晖 03723a1522 Merge branch 'develop_1' into 'develop_master' 
update：回复配置文件

See merge request !44
 2021-07-22 09:26:17 +00:00
王夏晖 454af6e305 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !42
 2021-07-22 08:32:12 +00:00
王夏晖 eca5c9ae33 Update application-dev.properties 2021-07-16 08:50:12 +00:00
王夏晖 ee73581912 Update application.properties 2021-07-16 08:27:45 +00:00
王夏晖 f52e33fa3c Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !32
 2021-07-15 06:24:04 +00:00
王夏晖 952c3ab02a Update application-dev.properties 2021-07-09 03:42:02 +00:00
王夏晖 3c7acb2705 Update application-dev.properties 2021-07-07 02:21:45 +00:00
王夏晖 7bb46ef07f Update application-dev.properties 2021-07-05 02:34:45 +00:00
王夏晖 b69bc81066 Update application-dev.properties 2021-06-30 05:02:07 +00:00
王夏晖 95f8f7dfff Merge branch 'develop_1' into 'develop_master' 
add:标准法规清单

See merge request !14
 2021-06-29 06:57:10 +00:00
王夏晖 1e5ac1b1dd Update application.properties 2021-06-17 02:45:31 +00:00
王夏晖 282c314da9 Update application-dev.properties 2021-06-17 02:11:11 +00:00
王夏晖 fe3c2a4f6a Update application-dev.properties 2021-06-17 02:11:00 +00:00