Commit Graph
807 Commits
Author SHA1 Message Date
王怡栋 a3bb60c87d Merge branch 'sprint/master_zhouxudong_57871' into 'sprint/205'
Sprint/master zhouxudong 57871

See merge request easycorp/zentaopms!4024
2022-06-21 06:03:28 +00:00
leiyong b0645c9cdd * Adjust CSS. 2022-06-21 02:13:42 +00:00
leiyong 725f37fcd0 * Finish task#57868. 2022-06-20 09:55:19 +00:00
leiyong bb125909dc Finish task#57864. 2022-06-20 09:44:25 +00:00
leiyong 101c0f58a5 * Finish task#57863. 2022-06-20 06:58:29 +00:00
zhouxudong 19d289455a * Finish task #57880 #57881 #57866. 2022-06-20 06:34:29 +00:00
xieqiyu 771db77e9f * Finish task#56907. 2022-06-13 14:03:54 +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
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
leiyong ea4eb1d2de * Finish task#54979. 2022-05-26 07:28:03 +00:00
zenggang c1f648d22a * Fix bug#22957 2022-05-26 05:36:53 +00:00
wangyidong 9508d7729b * code for bug #21400. 2022-04-27 09:55:50 +08:00
wangyidong 66df7b4990 * code for bug #15377. 2022-04-26 16:43:10 +08:00
xieqiyu 0eb4023b74 * Fix bug#13863. 2022-04-19 11:25:05 +08:00
tanghucheng 3707793e40 * Fix bug for product index. 2022-04-15 15:27:46 +08:00
王怡栋 8f11396658 Merge branch 'fixbug' into 'master'
* Fix bug #17634.

See merge request easycorp/zentaopms!2962
2022-04-15 06:42:32 +00:00
tanghucheng 9761644a92 * Fix bug #17634. 2022-04-15 14:41:18 +08:00
王怡栋 1191d86cd4 Merge branch 'sprint/master_zhouxudong_17929' into 'master'
* Fix bug #17929.

See merge request easycorp/zentaopms!2947
2022-04-14 09:21:00 +00:00
xieqiyu f971ded6fd * Fix bug#14454. 2022-04-14 16:13:18 +08:00
zhouxudong 68fbd1baf0 * Fix bug #17929. 2022-04-14 16:00:27 +08:00
孙广明 96aac66684 Merge branch 'master_xieqiyu_13127' into 'master'
* Fix bug#13127.

See merge request easycorp/zentaopms!2914
2022-04-13 08:22:07 +00:00
王怡栋 6e9c3a8afc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *21293

See merge request easycorp/zentaopms!2915
2022-04-13 06:49:48 +00:00
Zongjun Lan 0aa1cc9ad9 * fix bug *21293 2022-04-13 14:39:33 +08:00
xieqiyu 573fa80df6 * Fix bug#13127. 2022-04-13 14:00:25 +08:00
zhouxudong 20a9051148 * Fix bug #14891. 2022-04-13 11:23:29 +08:00
xieqiyu f1aad53d14 * Fix bug#13127. 2022-04-12 13:20:26 +08:00
Hao Sun 025a6f32b0 * bug #18928, fix switch button not work when statistic block place in right side. 2022-04-02 16:25:02 +08:00
李玉春 315c7e1041 Merge branch 'sprint/master_zhouxudong_13789' into 'master'
* Fix bug #13789.

See merge request easycorp/zentaopms!2739
2022-04-02 06:59:11 +00:00
李玉春 8329ed43fa Merge branch 'devops24_zenggang' into 'master'
Fix bug#13131,16610

See merge request easycorp/zentaopms!2718
2022-04-02 06:32:21 +00:00
mayue f54b38b241 * Fix bug #21435. 2022-04-02 10:15:33 +08:00
zhouxudong 4a82fa28cd * Fix bug #13789. 2022-04-02 09:18:24 +08:00
zenggang 8c1b36fb3d * Fix bug#13131,16610 2022-04-01 07:49:52 +00:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
zhouxudong bd13abc6b4 * Fix bug #13765. 2022-04-01 10:47:35 +08:00
zhouxudong 0e710b9f82 * Fix bug #13765. 2022-04-01 09:36:18 +08:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
hufangzhou 96de3c81b2 * Fix bug #21145. 2022-03-25 09:13:31 +08:00
liyuchun 57d6407fba * Fix bug #13732. 2022-03-24 10:51:43 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
tianshujie 305ec3c69a * Modify code location. 2022-03-15 09:57:56 +08:00
tianshujie ffe15a3b23 * Fix bug #20751. 2022-03-15 09:54:53 +08:00
tianshujie ff24c06fc9 * Modify the code judgment logic. 2022-03-15 09:41:54 +08:00
tianshujie 91e99b699b * Fix bug #20751. 2022-03-15 09:36:13 +08:00
sunjun 395314f726 fixbug #50432 2022-03-14 11:31:09 +08:00
sunjun d4b8dfef02 fix bug #50432 2022-03-11 15:09:59 +08:00
sunjun 0b0a1011e9 fix bug #50432 2022-03-11 15:02:14 +08:00
sunjun bbd2ccff01 bug优化 2022-03-11 14:25:56 +08:00
sunjun 00aaefa61c 地盘里看板项目icon显示看板 2022-03-11 13:35:03 +08:00
tianshujie 9f76842034 * Modify the code format. 2022-02-24 17:03:19 +08:00