Commit Graph
35 Commits
Author SHA1 Message Date
王夏晖 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