Commit Graph
33260 Commits
Author SHA1 Message Date
孙广明 48dc595192 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18890.

See merge request easycorp/zentaopms!1607
2022-01-25 08:44:14 +00:00
liumengyi 644f0fe851 * Fix bug #18890. 2022-01-25 16:43:15 +08:00
孙广明 00a31730c5 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Modify product plan view problem.

See merge request easycorp/zentaopms!1609
2022-01-25 08:32:34 +00:00
孙广明 8e17ce6eff Merge branch 'sprint/183_hufangzhou_18958' into 'master'
* Fix bug #18958.

See merge request easycorp/zentaopms!1610
2022-01-25 08:31:55 +00:00
hufangzhou 7115724593 * Fix bug #18958. 2022-01-25 16:30:01 +08:00
xieqiyu 03936d7b29 * Modify product plan view problem. 2022-01-25 16:27:51 +08:00
liumengyi 980facb451 * Fix bug #18890. 2022-01-25 16:20:25 +08:00
孙广明 81b210500d Merge branch 'sprint/scx_statistic_lang' into 'master'
*Statistic Lang.

See merge request easycorp/zentaopms!1606
2022-01-25 07:54:58 +00:00
孙广明 6faf406eb4 Merge branch 'sprint/183_zhouxin_18909' into 'master'
fix bug.

See merge request easycorp/zentaopms!1604
2022-01-25 07:54:22 +00:00
songchenxuan 3fc288c9a6 *Statistic Lang. 2022-01-25 15:40:44 +08:00
孙广明 73f9642ec4 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18952, #18904.

See merge request easycorp/zentaopms!1602
2022-01-25 07:03:00 +00:00
孙广明 475c854018 Merge branch 'sprint/183_tianshujie_bug' into 'master'
* Fix bug #18910,18762.

See merge request easycorp/zentaopms!1603
2022-01-25 07:02:06 +00:00
李玉春 3e977c6cc6 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Modify test problem.

See merge request easycorp/zentaopms!1605
2022-01-25 07:00:52 +00:00
xieqiyu 7feffbdcfa * Modify test problem. 2022-01-25 14:57:15 +08:00
tianshujie e8cf4abf9a * Fix bug. 2022-01-25 14:51:10 +08:00
zhouxin f79aa8806f fix bug. 2022-01-25 06:50:11 +00:00
tianshujie c56ecee795 * Fix bug #18910,18762. 2022-01-25 14:47:51 +08:00
liumengyi 9667299ce4 * Fix bug #18952, #18904. 2022-01-25 14:41:27 +08:00
孙广明 7167046722 Merge branch 'sprint/183_hufangzhou_fixbug' into 'master'
* Fix bug #17993.

See merge request easycorp/zentaopms!1586
2022-01-25 06:28:02 +00:00
孙广明 3c4a40b439 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug#18903.

See merge request easycorp/zentaopms!1600
2022-01-25 06:23:45 +00:00
liumengyi b6901081a7 * Remove empty line. 2022-01-25 14:18:35 +08:00
liumengyi fbeac8b6ca * Fix bug#18903. 2022-01-25 14:17:05 +08:00
孙广明 5eadae0143 Merge branch 'sprint/183_zhouxin_18950' into 'master'
Fix bug.

See merge request easycorp/zentaopms!1599
2022-01-25 06:09:12 +00:00
孙广明 ad3b7bfdbd Merge branch 'sprint/183_tianshujie_bug' into 'master'
* Fix bug #18944,18947,18946.

See merge request easycorp/zentaopms!1598
2022-01-25 06:08:39 +00:00
zhouxin 2141537a36 Fix bug. 2022-01-25 06:06:41 +00:00
tianshujie f7d58603fa * Fix bug #18944,18947,18946. 2022-01-25 14:05:23 +08:00
孙广明 4b1731dac0 Merge branch 'sprint/183_sunhao/new_icons' into 'master'
* Add new icons: "icon-ver" and "icon-publish".

See merge request easycorp/zentaopms!1582
2022-01-25 05:52:18 +00:00
孙广明 24a4746f8a Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Modify product plan desc.

See merge request easycorp/zentaopms!1597
2022-01-25 05:39:37 +00:00
孙广明 cac8eaa104 Merge branch 'sprint/183_tianshujie_bug' into 'master'
Sprint/183 tianshujie bug

See merge request easycorp/zentaopms!1596
2022-01-25 05:38:26 +00:00
xieqiyu dd15b07346 * Modify product plan desc. 2022-01-25 13:37:44 +08:00
tianshujie 363af0483b * Remove useless code. 2022-01-25 13:37:33 +08:00
tianshujie 428f613968 * Modify icon. 2022-01-25 13:31:55 +08:00
tianshujie 4185f88f29 * Fix bug #18948,18836,18804. 2022-01-25 13:27:38 +08:00
孙广明 5fec7d3964 Merge branch 'sprint/183_mayue_18875' into 'master'
* Fix bug #18875.

See merge request easycorp/zentaopms!1595
2022-01-25 05:20:04 +00:00
孙广明 703b4c713b Merge branch 'Fixbug' into 'master'
*Add finishCard and activateCard's history and dynamic.

See merge request easycorp/zentaopms!1594
2022-01-25 05:19:26 +00:00
mayue 5ee2825c26 * Fix bug #18875. 2022-01-25 13:15:18 +08:00
zhengrunyu bf807ad822 *Add finishCard and activateCard's history and dynamic. 2022-01-25 13:14:25 +08:00
孙广明 d9fade1caa Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Modify the mutual test problem.

See merge request easycorp/zentaopms!1593
2022-01-25 05:12:06 +00:00
孙广明 7d49af3c39 Merge branch 'sprint/183_liumengyi_18945' into 'master'
* Fix bug #18945.

See merge request easycorp/zentaopms!1592
2022-01-25 05:05:43 +00:00
xieqiyu 5d0f26bb46 * Modify the mutual test problem. 2022-01-25 13:04:32 +08:00
liumengyi 9828cad357 * Fix bug #18945. 2022-01-25 11:24:06 +08:00
孙广明 2ec4e43353 Merge branch 'sprint/183_tianshujie_18838' into 'master'
* Fix bug #18838.

See merge request easycorp/zentaopms!1591
2022-01-25 03:20:31 +00:00
孙广明 df75841d5b Merge branch 'sprint/183_xt_card' into 'master'
Sprint/183 xt card

See merge request easycorp/zentaopms!1587
2022-01-25 03:19:35 +00:00
tianshujie 7001f6c2d5 * Fix bug #18838. 2022-01-25 11:16:14 +08:00
孙广明 7a77064493 Merge branch 'sprint/183_zhouxin_fixbugs' into 'master'
Adjust code.

See merge request easycorp/zentaopms!1588
2022-01-25 03:12:57 +00:00
孙广明 5af5b98a3c Merge branch 'Fixbug' into 'master'
*Fix bug18942.

See merge request easycorp/zentaopms!1589
2022-01-25 03:12:35 +00:00
zhengrunyu b3ebd6f98b *Fixbug18942. 2022-01-25 11:11:16 +08:00
孙广明 771f5fb087 Merge branch 'sprint/183_liumengyi_18935' into 'master'
* Fix bug #18936, #18924.

See merge request easycorp/zentaopms!1590
2022-01-25 03:06:41 +00:00
zhengrunyu 8e470d86a4 *Fix bug18942. 2022-01-25 11:03:05 +08:00
liumengyi 571f530460 * Fix bug #18936, #18924. 2022-01-25 11:03:05 +08:00