Commit Graph
791 Commits
Author SHA1 Message Date
liuhong 806dddb5e0 *Fix bug #66461. 2022-08-30 00:30:00 +00:00
liuhong e69ab6d423 *Fix bug #66461. 2022-08-29 05:55:32 +00:00
liuhong 1a683550d1 *Fix bug #66461. 2022-08-29 05:38:18 +00:00
tianshujie 704de14c41 * Fix bug #26880. 2022-08-25 15:22:56 +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 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
王怡栋 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 1eccd830ec * Finish task #64976. 2022-08-18 17:24:06 +08:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
liuhong fda5a1b952 *Finish task #64883. 2022-08-18 02:51:35 +00:00
xieqiyu 6c1dba2561 * Add product and story lang. 2022-08-18 00:08:40 +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 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
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
zenggang dfae2ec61f * Fix bug#23205 2022-07-28 06:55:51 +00:00
xieqiyu 0ec68feb10 * Fix bug#25004. 2022-07-27 21:38:28 +08:00
xieqiyu cd8247954c * Fix bug#25004. 2022-07-27 13:31:48 +08:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
liumengyi b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
liumengyi 29993afa9e * Optimize code for bug #23123. 2022-07-08 13:55:41 +08:00
liumengyi 26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08:00
liumengyi 3049879a44 * Fix bug of task #59482. 2022-07-07 09:40:07 +08:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
孙广明 9ac3ed7851 * Code for product order. 2022-06-17 16:23:46 +08:00
tianshujie fa117ec408 * Delete useless code. 2022-06-16 17:23:34 +08:00
tianshujie fc2aea0aa9 * Delete useless code. 2022-06-16 17:21:50 +08:00
孙广明 1ca935f2b4 Merge branch 'sgm_fixbug' into 'master'
* Change product browse order btn.

See merge request easycorp/zentaopms!3987
2022-06-16 08:53:44 +00:00
孙广明 5af03f4cf6 * Change product browse order btn. 2022-06-16 16:52:08 +08:00
sunjun 7dfc3f64a2 fixbug_sunjun_23810 2022-06-16 05:49:32 +00:00
mayue d3018dd978 * Optimize code. 2022-06-10 17:25:14 +08:00
mayue d72eda83d9 * Optimize code. 2022-06-10 16:20:40 +08:00
mayue 9b76036761 * Optimize code. 2022-06-10 16:17:58 +08:00
mayue bf56790216 * Fix bug #22928. 2022-06-10 16:06:10 +08:00
hufangzhou 4385eab733 * Make the order of products in the product drop-down consistent with the product list. 2022-06-09 16:25:29 +08:00
孙广明 ecd7f1197f * Fix product order bug. 2022-06-09 14:48:56 +08:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
zhouxudong 88e32db3a6 * Finish task #55623. 2022-06-01 01:42:38 +00:00
zhouxudong 71a55f5dcf * Finish task #55623. 2022-06-01 01:37:18 +00:00
liumengyi ab2294d0a4 * Fix bug #23007. 2022-05-26 17:08:15 +08:00
hufangzhou 80c73a6f83 * Finish task #54990. 2022-05-25 13:30:30 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00