Commit Graph
2614 Commits
Author SHA1 Message Date
tianshujie 704de14c41 * Fix bug #26880. 2022-08-25 15:22:56 +08:00
tianshujie 06ab4ea7a5 * Fix bug #26862. 2022-08-25 13:06:38 +08:00
tianshujie cc3ebce871 * Fix bug #26862. 2022-08-25 10:42:34 +08:00
孙广明 41e346a299 Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5104
2022-08-25 01:57:26 +00:00
tianshujie 1c1ccb2c6a * Fix bug #26834. 2022-08-25 09:27:57 +08:00
tianshujie 8e46aa45f5 * Fix bug #26832. 2022-08-25 09:07:19 +08:00
孙广明 2cd85595a1 Merge branch 'sprint/231_liumengyi_26841' into 'master'
* Fix bug #26841.

See merge request easycorp/zentaopms!5101
2022-08-25 00:56:29 +00:00
liumengyi de58e793b4 * Fix bug #26841. 2022-08-25 08:39:47 +08:00
xieqiyu 6f18dfa4cc * Fix bug#26764. 2022-08-24 14:22:58 +08:00
李玉春 00ada6310a Merge branch 'sprint/231_tianshujie_css' into 'master'
* Modify name beyond hidden style.

See merge request easycorp/zentaopms!5075
2022-08-24 02:26:51 +00:00
tianshujie 0df81d9a3b * Fix bug #26817. 2022-08-24 10:19:19 +08:00
xieqiyu 6e531700ee * Finish task#60722. 2022-08-23 16:56:58 +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
liumengyi 545d74f7d0 * Optimize code for task #65808, #65807. 2022-08-23 14:50:40 +08:00
liumengyi cc92f9d3ef * Optimize code. 2022-08-23 13:54:29 +08:00
liumengyi 617122882a * Finish task #65807. 2022-08-23 13:45:44 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
xieqiyu f47daae589 * Modify story review and other about story. 2022-08-22 14:34:37 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
liumengyi f42d3690c5 * Finish task #64967. 2022-08-22 10:06:05 +08:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
tianshujie 36347984e3 * Finish task #64967. 2022-08-19 14:41:30 +08:00
tianshujie 1eccd830ec * Finish task #64976. 2022-08-18 17:24:06 +08:00
tianshujie 2851fd4c2c * Resolve issue #720. 2022-08-18 16:24:43 +08:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
liuhong 24ea56af1c *Finish task #64880. 2022-08-18 02:51:35 +00:00
liuhong fda5a1b952 *Finish task #64883. 2022-08-18 02:51:35 +00:00
xieqiyu a7d8ff275d * Modify lang. 2022-08-18 09:38:44 +08:00
xieqiyu 6c1dba2561 * Add product and story lang. 2022-08-18 00:08:40 +08:00
liumengyi 73253183bc * Finish task #64967. 2022-08-17 17:10:10 +08:00
tianshujie df8c9caf46 * Finish task #64967. 2022-08-17 16:37:02 +08:00
tianshujie 24e39026cc * Finish task #64967. 2022-08-16 17:07:27 +08:00
xieqiyu 8c2e982023 * Fix bug of product list page. 2022-08-16 09:07:45 +08:00
曾刚 de80b35803 * Fix bug#26389,26333,26328 2022-08-12 08:17:54 +00:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
wangyidong 1915ef01e5 * fix for get plans when no product. 2022-08-11 14:21:22 +08:00
xieqiyu 69830e04d7 * Fix bug#26097. 2022-08-08 13:14:21 +08:00
zenggang a9fc847711 * Adjust code 2022-08-05 06:37:45 +00:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
liuruogu a28d225da9 * Finish task #63381. 2022-08-03 08:21:44 +00:00
liuruogu 37e55ee3c9 * Finish task #63392. 2022-08-03 07:31:11 +00:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
王怡栋 1c54132793 Merge branch 'master_liuhong_24281' into 'master'
Master liuhong 24281

See merge request easycorp/zentaopms!4752
2022-08-03 02:13:32 +00:00
liuhong 1e6366945d *Fix bug #24281 2022-08-03 01:44:41 +00:00
liuhong abcbe76d24 *Fix bug 24281 2022-08-03 01:40:55 +00:00
zenggang e3698f1b6a * Adjust code 2022-08-03 00:48:59 +00:00
zenggang d9e251ea26 * Fix bug#25416 2022-08-02 09:29:33 +00:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00