Commit Graph
32185 Commits
Author SHA1 Message Date
hufangzhou cc140db6a1 * Fix bug #11808. 2022-04-18 14:08:31 +08:00
Zongjun Lan 921b3e96ce * fix bug *12982 2022-04-18 14:08:02 +08:00
zhouxudong c449b53e4b * Fix bug #20178. 2022-04-18 13:59:09 +08:00
xieqiyu 8ce20cb746 * Fix bug#14454. 2022-04-18 13:45:46 +08:00
王怡栋 a1e72ace5e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-18 13:26:47 +08:00
王怡栋 323f7366ba * code for bug #21020. 2022-04-18 13:26:25 +08:00
zhouxudong 532920579e * Fix bug #20178. 2022-04-18 13:20:44 +08:00
孙广明 6703d17651 Merge branch 'fixbug_sunjun_qijian' into 'master'
Fixbug sunjun qijian

See merge request easycorp/zentaopms!2970
2022-04-18 05:20:23 +00:00
liyuchun c5eddbe19b * Fix bug #21565. 2022-04-18 11:49:44 +08:00
liyuchun 13d354ba8c * Fix bug #21518. 2022-04-18 11:35:36 +08:00
王怡栋 0d0fcb0c2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-18 11:30:31 +08:00
李玉春 4334eca80d Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2978
2022-04-18 03:30:09 +00:00
王怡栋 a481ba2959 * adjust for check priv. 2022-04-18 11:26:21 +08:00
tianshujie ab1ad4051b * Fix bug #21682. 2022-04-18 11:21:54 +08:00
zhouxudong 9f50c3abaa * Fix bug #20178. 2022-04-18 11:18:33 +08:00
孙广明 df7235355c Merge branch 'sunhuawei_fixbug_20316' into 'master'
* Fix bug #20316.

See merge request easycorp/zentaopms!2976
2022-04-18 02:59:35 +00:00
孙华伟 a5d6663342 * Fix bug #20316. 2022-04-18 10:55:42 +08:00
tianshujie 685a583d99 * Fix bug #17551. 2022-04-18 10:50:50 +08:00
Hao Sun e1a11341c6 * refactor: format. 2022-04-18 10:34:14 +08:00
Hao Sun af43ca6bb3 * bug #6910, optimize helper "text-limit" and support for displaying html. 2022-04-18 10:25:28 +08:00
caoyanyi b27e1f76d7 * Modify field name. 2022-04-18 10:06:35 +08:00
caoyanyi e98d1ac4ab * Fix bug #21763. 2022-04-18 10:03:47 +08:00
hufangzhou 80ac96b791 * Fix bug #21770. 2022-04-18 09:19:34 +08:00
朱金勇 7aeeb96c42 Merge branch 'fix_bug_wangxiaomeng_#17253' into 'master'
fix_bug_17253

See merge request easycorp/zentaopms!2959
2022-04-18 00:13:57 +00:00
朱金勇 1ad5accfce Merge branch 'sprint/sunhao/bug19052' into 'master'
* bug #19052, fix width for some models.

See merge request easycorp/zentaopms!2965
2022-04-18 00:10:55 +00:00
sunjun ccca03fb97 *Fixbug_sunjun_qijian 2022-04-16 22:52:43 +08:00
sunjun db0fd23155 *Fixbug_sunjun_qijian 2022-04-16 22:46:42 +08:00
孙广明 a5cb540de9 Merge branch 'master_xieqiyu_19318' into 'master'
* Fix bug#19318.

See merge request easycorp/zentaopms!2961
2022-04-15 07:46:54 +00:00
孙广明 ae2f0bad83 Merge branch 'fixbugs_zhouxin_21801' into 'master'
* Fix bug #21801.

See merge request easycorp/zentaopms!2969
2022-04-15 07:42:23 +00:00
王怡栋 bf33ed0efe Merge branch 'fixbug' into 'master'
* Fix bug for product index.

See merge request easycorp/zentaopms!2967
2022-04-15 07:38:00 +00:00
王怡栋 96402db109 Merge branch 'sprint/fixbug_hufangzhou_20062' into 'master'
* Fix bug #20062.

See merge request easycorp/zentaopms!2966
2022-04-15 07:37:43 +00:00
王怡栋 dc0635555d Merge branch 'jira' into 'master'
* Code for convert jira.

See merge request easycorp/zentaopms!2968
2022-04-15 07:36:39 +00:00
zhouxin b04e4d2236 * Fix bug #21801. 2022-04-15 07:36:19 +00:00
孙广明 1bdbd20394 * Code for convert jira. 2022-04-15 15:34:37 +08:00
tanghucheng 3707793e40 * Fix bug for product index. 2022-04-15 15:27:46 +08:00
hufangzhou a629ac2c12 * Fix bug #20062. 2022-04-15 15:22:58 +08:00
孙广明 762a8e065c Merge branch 'fixbug_sunjun_19732' into 'master'
*Fixbug_sunjun_19732

See merge request easycorp/zentaopms!2963
2022-04-15 06:48:23 +00:00
孙广明 0b71ec6380 Merge branch 'sprint/unitTest_liumengyi_tree' into 'master'
* Add unit test of tree.

See merge request easycorp/zentaopms!2964
2022-04-15 06:47:25 +00: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
liumengyi 51aa9835f6 * Add unit test of tree. 2022-04-15 14:35:38 +08:00
Hao Sun 6ea976a722 * bug #19052, fix width for some models. 2022-04-15 14:35:05 +08:00
wangxiaomeng 8a5e5c12d5 fix_bug#17253 2022-04-15 14:27:51 +08:00
sunjun 3a60274cf6 *Fixbug_sunjun_19732 2022-04-15 14:23:08 +08:00
xieqiyu eda23f27f1 * Fix bug: manage contacts have two chosen. 2022-04-15 14:16:07 +08:00
wangxiaomeng c1a51d747c fix_bug #17253 2022-04-15 14:07:42 +08:00
xieqiyu 477a2a4162 * Fix bug#19318. 2022-04-15 13:57:35 +08:00
王怡栋 2478e067f4 * code for bug #15386. 2022-04-15 13:43:45 +08:00
王怡栋 0bc5f82ce7 Merge branch 'fixbugs_zhouxin_21783' into 'master'
* Fix bug #21783.

See merge request easycorp/zentaopms!2960
2022-04-15 05:23:14 +00:00
李玉春 d426e7cf75 Merge branch 'devops26_52594' into 'master'
Fix bug#16732

See merge request easycorp/zentaopms!2957
2022-04-15 05:07:31 +00:00