Commit Graph
44995 Commits
Author SHA1 Message Date
刘刚 bfc50bdb34 Merge branch 'sprint/243_liugang_optimize' into 'zentaopms_239'
* Optimize the method getPairs of the product module.

See merge request easycorp/zentaopms!5446
2022-09-21 03:12:14 +00:00
liugang 11f0ca4453 * Optimize the method getPairs of the product module. 2022-09-21 11:10:34 +08:00
sunguangming 262bc3c572 * Merge code. 2022-09-21 11:00:20 +08:00
刘刚 506390963b Merge branch 'sprint/239_liuruogu_task_69600' into 'zentaopms_239'
* Finish task #69015.

See merge request easycorp/zentaopms!5443
2022-09-21 02:32:24 +00:00
liuruogu 1c54d00d31 * Finish task #69015. 2022-09-21 02:24:15 +00:00
刘刚 9af05084a9 Merge branch 'sprint/243_liugang_optimize' into 'zentaopms_239'
* Optimize.

See merge request easycorp/zentaopms!5440
2022-09-21 01:57:01 +00:00
liugang 4768b07207 * Optimize. 2022-09-21 09:56:35 +08:00
刘刚 078e11763c Merge branch 'sprint/239_liuruogu_task_69600' into 'zentaopms_239'
* Finish task #69015.

See merge request easycorp/zentaopms!5435
2022-09-21 01:54:42 +00:00
sunguangming 9e5ef66c7b * Code for task #69595. 2022-09-21 09:01:30 +08:00
liuruogu c41f5de9fb * Finish task #69015. 2022-09-21 00:59:50 +00:00
sunguangming 6710cd1d1c * Code for product getList. 2022-09-21 08:59:17 +08:00
刘刚 f67af23212 Merge branch 'sprint/243_liugang_69594' into 'zentaopms_239'
Sprint/243 liugang 69597

See merge request easycorp/zentaopms!5434
2022-09-21 00:46:36 +00:00
liugang 6b3e0329e2 * If the product is a shadow one hide it when create a testtask. 2022-09-21 08:42:00 +08:00
liugang 048441961b * Adjust and Remove the useless style. 2022-09-21 08:39:15 +08:00
liugang cb9c662a97 * Use the product's name instead of the product's name if the product is a shadow one. 2022-09-20 17:50:07 +08:00
刘刚 43e8fd4bca Merge branch 'sprint/239_liuruogu_task_69600' into 'zentaopms_239'
* Finish task #69600.

See merge request easycorp/zentaopms!5433
2022-09-20 09:17:15 +00:00
liuruogu 432ff3c8a2 * Finish task #69600. 2022-09-20 09:11:56 +00:00
liuruogu 403e2a0265 * Finish task #69600. 2022-09-20 09:02:35 +00:00
liuruogu dfb413dbb8 * Finish task #69600. 2022-09-20 09:02:23 +00:00
刘刚 c8f31700f5 Merge branch 'sprint/243_liugang_69594' into 'zentaopms_239'
Sprint/243 liugang 69594

See merge request easycorp/zentaopms!5430
2022-09-20 07:50:47 +00:00
刘刚 2232f8896c Merge branch 'sprint/239_liuruogu_task_69015' into 'zentaopms_239'
* Fix bug #27604.

See merge request easycorp/zentaopms!5428
2022-09-20 07:50:34 +00:00
liugang 89b67557cf * Fit changes of the getList method of the product module. 2022-09-20 15:47:53 +08:00
liugang 39d330e45b * Use the related project's name instead of the product's name if it's a shadow product. 2022-09-20 15:37:52 +08:00
liugang 6e47d6c8ca * Remove useless codes. 2022-09-20 15:31:06 +08:00
liuruogu e461c66fc0 * Fix bug #27604. 2022-09-20 07:30:32 +00:00
liugang a9c30daa88 * Change the lang item. 2022-09-20 15:00:18 +08:00
刘刚 fb03c6c839 Merge branch 'sprint/239_liuruogu_task_69015' into 'zentaopms_239'
* Fix bug #27566.

See merge request easycorp/zentaopms!5425
2022-09-20 06:37:07 +00:00
liuruogu bb2e20965e * Fix bug #27566. 2022-09-20 06:25:26 +00:00
刘刚 0291c8fbc2 Merge branch 'sprint/239_liuruogu_task_69015' into 'zentaopms_239'
* Fix bug #27576.

See merge request easycorp/zentaopms!5421
2022-09-20 05:45:50 +00:00
liuruogu f21dd89912 * Fix bug #27500. 2022-09-20 05:35:30 +00:00
liuruogu 75282f1334 * Fix bug #27576. 2022-09-20 02:52:54 +00:00
刘刚 5096ec4364 Merge branch 'sprint/239_liuruogu_task_69015' into 'zentaopms_239'
* Finish task #69015.

See merge request easycorp/zentaopms!5419
2022-09-20 02:31:24 +00:00
liuruogu ea9c6d6802 * Finish task #69015. 2022-09-20 02:00:20 +00:00
孙广明 8564136f6b Merge branch 'sgm_69020' into 'zentaopms_239'
* Code for task #69020.

See merge request easycorp/zentaopms!5418
2022-09-20 01:45:12 +00:00
sunguangming a7da5afcfe * Code for task #69020. 2022-09-20 09:44:22 +08:00
孙广明 482f73b8c9 Merge branch 'sgm_69020' into 'zentaopms_239'
* Fix #69020 bug.

See merge request easycorp/zentaopms!5417
2022-09-20 01:26:32 +00:00
sunguangming d0f27c1ef0 * Fix #69020 bug. 2022-09-20 09:24:29 +08:00
刘刚 7c1c2b6819 Merge branch 'sprint/243_liugang_fixbug_27572' into 'zentaopms_239'
* Fix bug #27572.

See merge request easycorp/zentaopms!5414
2022-09-19 09:37:41 +00:00
liugang 47ccd4895c * Fix bug #27572. 2022-09-19 17:21:44 +08:00
刘刚 41bcd48905 Merge branch 'zentaopms_239_tanghucheng' into 'zentaopms_239'
* Finish task #69594.

See merge request easycorp/zentaopms!5412
2022-09-19 09:03:52 +00:00
tanghucheng 187a310622 * Fix function annotations for product. 2022-09-19 17:00:08 +08:00
tanghucheng d8e0bae8c8 * Finish task #69594. 2022-09-19 16:56:30 +08:00
刘刚 9b5823c7a3 Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239'
* Fix bug #27570.

See merge request easycorp/zentaopms!5411
2022-09-19 08:38:20 +00:00
孙广明 e588819158 Merge branch 'sgm_69020' into 'zentaopms_239'
Sgm 69020

See merge request easycorp/zentaopms!5410
2022-09-19 08:37:38 +00:00
sunguangming ebe4a88493 * Finish task #69020. 2022-09-19 16:36:48 +08:00
liuruogu bfccfd4f79 * Fix bug #27570. 2022-09-19 08:33:05 +00:00
刘刚 7418dca876 Merge branch 'sprint/243_liugang_fixbug_27562' into 'zentaopms_239'
* Fix bug #27562.

See merge request easycorp/zentaopms!5409
2022-09-19 08:31:40 +00:00
liugang 15f3ec081b * Fix bug #27562. 2022-09-19 16:30:49 +08:00
刘刚 616710244f Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239'
* Fix bug #27553, #27529.

See merge request easycorp/zentaopms!5407
2022-09-19 08:26:53 +00:00
liuruogu 77e034b529 * Fix bug #27539. 2022-09-19 08:18:53 +00:00