Commit Graph
770 Commits
Author SHA1 Message Date
lanzongjun 284b748e7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-11-22 15:45:19 +08:00
lanzongjun a3f8f5f437 * Fix Task #77278 2022-11-22 14:23:01 +08:00
xieqiyu 46879558bb * Fix bug#30027. 2022-11-22 09:52:08 +08:00
wangyuting 5df0b941b1 * Fix bug #29959. 2022-11-18 02:51:50 +00:00
wangyuting 532bef39f3 * Finish task #76434. 2022-11-17 08:03:03 +00:00
王怡栋 66be15c00f * fix bug #29736. 2022-11-15 11:13:04 +08:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00
xieqiyu af5b858388 * Finish task#75379,#75324. 2022-11-09 02:26:35 +00:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
Yagami 0e3de2163b * Fix referer bug. 2022-10-28 09:17:19 +08:00
王怡栋 c1db41db21 Merge branch 'zentaopms_239_task#28924' into 'zentaopms_239'
* Fix bug #28924.

See merge request easycorp/zentaopms!5902
2022-10-27 05:46:29 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyuting2 a4e210b425 * Finish task #28924. 2022-10-27 00:58:32 +00:00
wangyidong 585b12838e * code for task #73472. 2022-10-25 14:04:12 +08:00
王怡栋 aa49a5bbd3 Merge branch 'zentaopms_239_task_#72984' into 'zentaopms_239'
* Finish task #72984.

See merge request easycorp/zentaopms!5883
2022-10-25 05:08:33 +00:00
daitingting 1aa860c972 * Finish task #72984. 2022-10-25 03:24:04 +00:00
daitingting 9825419bd4 * Finish task #73066. 2022-10-25 02:06:30 +00:00
wangyuting2 541ea48b72 * Finish task #72986. 2022-10-24 06:14:53 +00:00
lanzongjun da3f54870d fix bug guide 2022-10-21 16:13:38 +08:00
wangyuting2 decff18c2a * Finish task #71570. 2022-10-20 06:11:00 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liugang 48703a3f26 * Fix bug #28271. 2022-10-09 16:53:11 +08:00
曹延义 9e7e1f6969 * Finish task #71906. 2022-10-08 17:17:42 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tianshujie cc5e5d3c1d * Fix bug #28192. 2022-09-29 18:06:12 +08:00
曹延义 e363bb4ef9 Merge branch 'sprint/244' into sprint/244_wangzemei_70009 2022-09-28 15:19:58 +08:00
tianshujie 43a95b18e2 * Finish task #70487,70492. 2022-09-28 10:45:23 +08:00
wangyidong 4d9856be14 * code for task #70540. 2022-09-28 09:25:52 +08:00
曹延义 d16362e3da * Set batch edit checkbox style to cookie. 2022-09-28 08:58:30 +08:00
liugang fe8357d0a6 * Fix bug #27653. 2022-09-27 09:09:03 +08:00
wangyuting2 951d1c2d1f * Fix bug #27807. 2022-09-26 08:11:04 +00:00
刘刚 7f4b59d932 Merge branch 'sprint/239_liuruogu_bug' into 'zentaopms_239'
* Fix bug #27645.

See merge request easycorp/zentaopms!5465
2022-09-22 01:43:24 +00:00
sunguangming 494c095e9e * Fix bug code error. 2022-09-22 08:51:51 +08:00
liuruogu fb33ebbeaa * Fix bug #27645. 2022-09-22 00:47:28 +00:00
liugang 48ea66f96b * Fix bug of get the no-product project's name. 2022-09-21 16:29:56 +08:00
liugang 11f0ca4453 * Optimize the method getPairs of the product module. 2022-09-21 11:10:34 +08:00
sunguangming 9e5ef66c7b * Code for task #69595. 2022-09-21 09:01:30 +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 47ccd4895c * Fix bug #27572. 2022-09-19 17:21:44 +08:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
liugang 8248051b39 * Finish task #68997. 2022-09-16 11:55:52 +08:00
liuruogu 17392ef1ac * Finsih task #69013. 2022-09-15 08:45:57 +00:00
liuruogu ea62645622 * Do task #69018. 2022-09-15 01:43:27 +00:00
liuruogu eb0265df2e * Do task #69018. 2022-09-15 00:46:51 +00:00
liugang 6d750abaf0 * Finish task #68996. 2022-09-14 16:37:27 +08:00
tianshujie 0df81d9a3b * Fix bug #26817. 2022-08-24 10:19:19 +08:00
李玉春 3e487df2b3 Merge branch 'sprint/231_tianshujie_65808' into 'master'
* Finish task #65808, #65807.

See merge request easycorp/zentaopms!5067
2022-08-23 08:26:36 +00:00
liumengyi c95ecbd1a6 * Optimize code for task #65808. 2022-08-23 16:19:20 +08:00