Commit Graph
930 Commits
Author SHA1 Message Date
zenggang 9314b23885 * Fix bug#25998,26017 2022-08-04 02:48:29 +00:00
wangyidong d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
zenggang 3a9f4d8ada * Fix bug#25897,22882 2022-08-03 07:16:28 +00:00
tianshujie 167c36d6d5 * Finish task #62947. 2022-08-03 13:41:05 +08:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
wangyuting2 fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00
dongli b664ed8b43 * Fix bug #25851 2022-08-02 07:03:57 +00:00
wangyuting2 dc14d91320 * Finish task #63286. 2022-08-02 14:54:20 +08:00
dongli 80753ec1f0 * Fix bug #25851. 2022-08-02 06:41:48 +00:00
王怡栋 9f7bbb08f8 Merge branch 'sprint/master_zhouxudong_25841' into 'master'
* Fix bug #25841.

See merge request easycorp/zentaopms!4718
2022-07-28 08:51:09 +00:00
zhouxudong cae237887d * Fix bug #25841. 2022-07-28 08:36:12 +00:00
zenggang 92abbcfdf5 * Fix bug#62106 2022-07-28 08:03:40 +00:00
liumengyi a7568986c1 * Fix bug for change tab. 2022-07-28 14:21:28 +08:00
liumengyi ad763d0fd5 * Optimize code for task #62494. 2022-07-28 10:04:05 +08:00
liumengyi 1375165c73 * Optimize code for task #62494. 2022-07-28 10:02:43 +08:00
liumengyi e13315a151 * Finish task #62494. 2022-07-28 09:57:02 +08:00
王怡栋 378fb33899 Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112

See merge request easycorp/zentaopms!4687
2022-07-27 08:59:23 +00:00
孙广明 41e968cf34 Merge branch 'sprint/220_liumengyi_35409' into 'master'
* Finish task #62492, #62493, #62494.

See merge request easycorp/zentaopms!4691
2022-07-27 08:09:36 +00:00
liumengyi 352270909e * Finish task #62492, #62493, #62494. 2022-07-27 16:07:23 +08:00
王怡栋 ad6f2d86fd Merge branch 'sprint/master_zhouxudong_24318' into 'master'
* Fix bug #24318.

See merge request easycorp/zentaopms!4684
2022-07-27 07:22:38 +00:00
zhouxudong 3a251f99b6 * Fix bug #24318. 2022-07-27 07:09:12 +00:00
liumengyi 5551773576 * Finish story #35409, #35408, #35407. 2022-07-27 14:50:07 +08:00
liumengyi 0ba22df874 * Fix issue #695. 2022-07-27 13:06:12 +08:00
liumengyi 30b7ecbee7 * Fix bug #24009. 2022-07-26 16:02:47 +08:00
liumengyi a0a9d5e765 * Optimize for task #61971. 2022-07-26 12:02:28 +08:00
liumengyi b67950c1ba * Fix bug for task #61973. 2022-07-26 10:27:08 +08:00
liumengyi 865986c216 * Finish task #61973. 2022-07-26 09:36:30 +08:00
chaideqing 3fc3cf64e0 * remove zentao card's top-right button 2022-07-26 09:12:42 +08:00
liumengyi ba16cfa637 * Fix bug #61971. 2022-07-25 13:15:28 +08:00
tianshujie 4b59c7025a * Fix page error problem. 2022-07-21 17:34:07 +08:00
王怡栋 dcd013186a Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4620
2022-07-21 05:08:47 +00:00
王怡栋 660f0d0d85 Merge branch 'sprint/master_zhouxudong_61441' into 'master'
Sprint/master zhouxudong 61441

See merge request easycorp/zentaopms!4606
2022-07-21 02:03:20 +00:00
tianshujie e0537276bd * Delete useless code. 2022-07-21 09:30:35 +08:00
zhouxudong 1c4c282aee * Finish task #61441. 2022-07-21 01:29:57 +00:00
王怡栋 d349931e82 Merge branch 'sprint/217_liumengyi_61171' into 'master'
* Finish task #61171, #61170.

See merge request easycorp/zentaopms!4610
2022-07-20 06:23:40 +00:00
tianshujie 72ac19d156 * Finish task #61177. 2022-07-20 09:42:37 +08:00
tianshujie e8603eef32 * Finish task #61181. 2022-07-19 15:25:43 +08:00
liumengyi d73346c395 * Finish task #61171, #61170. 2022-07-19 15:22:38 +08:00
zhouxudong da0401def9 * Fix bug #24318. 2022-07-15 06:58:16 +00:00
王怡栋 7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
2022-07-15 03:17:39 +00:00
xieqiyu 311436573a * Fix bug#25365. 2022-07-15 11:12:04 +08:00
xieqiyu a44ba79b1d * Fix bug#25027. 2022-07-14 13:35:17 +08:00
王怡栋 196ee9ff18 Merge branch 'master_xieqiyu_25094' into 'master'
* Fix bug#25094.

See merge request easycorp/zentaopms!4530
2022-07-14 05:03:50 +00:00
zenggang fd9b0b1053 * Fix bug#25241 2022-07-14 02:20:00 +00:00
xieqiyu bbab93d08d * Fix bug#25094. 2022-07-14 09:59:06 +08:00
孙广明 6a4d372473 Merge branch 'sprint216_zg_bug' into 'master'
* Fix bug#25222,25232

See merge request easycorp/zentaopms!4527
2022-07-14 01:46:53 +00:00
孙广明 d41303c7e2 Merge branch 'fixbug_dynamic' into 'master'
fixbug_dynamic

See merge request easycorp/zentaopms!4515
2022-07-14 01:44:53 +00:00
zenggang 38e996bd18 * Fix bug#25222,25232 2022-07-14 01:38:00 +00:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00