Commit Graph
42971 Commits
Author SHA1 Message Date
zhouxudong 90e0daf6c0 * Finish task. 2022-08-09 06:32:29 +00:00
zhouxudong 3cc9977663 * Finisha task. 2022-08-09 05:49:27 +00:00
zhouxudong ef847f1169 * Finish task #63581. 2022-08-08 14:37:33 +00:00
zhouxudong abc59ed7aa * Finish task #63679. 2022-08-07 15:21:43 +00:00
zhouxudong c68f271328 * Finish task 62581. 2022-08-07 13:55:38 +00:00
zhouxudong 0091ac82c6 * Update. 2022-08-05 08:16:11 +00:00
zhouxudong e56f5c8082 * Update code. 2022-08-05 07:39:23 +00:00
zhouxudong 0e5fccdc46 * Update code. 2022-08-05 06:20:54 +00:00
zhouxudong 03ed6c4dfe * Update code. 2022-08-05 05:50:15 +00:00
zhouxudong e3ea94dd9b * Update code. 2022-08-05 05:31:38 +00:00
zhouxudong 0c422c824e * Fix bug. 2022-08-05 02:02:36 +00:00
zhouxudong cf009e9c80 * Reconstruction method. 2022-08-05 01:58:27 +00:00
王怡栋 4d80ebf283 Merge branch 'sprint/221_liumengyi_26025' into 'master'
* Fix bug #26025.

See merge request easycorp/zentaopms!4800
2022-08-04 07:52:24 +00:00
liumengyi c9fc80ef4d * Fix bug #26025. 2022-08-04 15:50:40 +08:00
王怡栋 b0079165da Merge branch 'sprint/221_tianshujie_25732' into 'master'
* Fix bug #25732.

See merge request easycorp/zentaopms!4798
2022-08-04 06:51:25 +00:00
tianshujie bfbc7b1e1b * Fixed style issues with deferred execution cards. 2022-08-04 14:49:16 +08:00
tianshujie 202da1587e * Fix bug #25813. 2022-08-04 14:46:10 +08:00
tianshujie fb8185dd2b * Fix bug #25732. 2022-08-04 14:37:05 +08:00
王怡栋 2a03c9bfe3 Merge branch 'sprint/221_liumengyi_63455' into 'master'
* Finish task #63455.

See merge request easycorp/zentaopms!4797
2022-08-04 06:21:37 +00:00
tianshujie b73c5fb933 * Fix bug #25732. 2022-08-04 14:19:12 +08:00
tianshujie 02f02fc291 * Fix bug #25732. 2022-08-04 14:17:18 +08:00
胡方舟 ea3ce57b94 Merge branch 'sprint/221_dongli_62948' into 'master'
* Finish task #62948

See merge request easycorp/zentaopms!4796
2022-08-04 06:17:11 +00:00
dongli bcd6fd0c0f * Finish task #62948 2022-08-04 06:10:02 +00:00
王怡栋 14a12f3d8d Merge branch 'master_xieqiyu_26045' into 'master'
* Fix bug#26045.

See merge request easycorp/zentaopms!4788
2022-08-04 05:52:57 +00:00
王怡栋 12bb4555c2 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4790
2022-08-04 05:52:43 +00:00
zhouxudong 7a34334374 * Fix bug. 2022-08-04 05:50:24 +00:00
liumengyi 02a3c130c0 * Fix bug for task #63455. 2022-08-04 13:37:17 +08:00
xieqiyu d69d68f9bd * Fix bug#26045. 2022-08-04 13:34:09 +08:00
王怡栋 c80090ff79 Merge branch 'sprint/221_zg_bugs' into 'master'
* Fix bug#25998,26017,23426

See merge request easycorp/zentaopms!4783
2022-08-04 03:56:58 +00:00
wangyidong 8bea830d4a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 11:51:37 +08:00
wangyidong 0ce2b35004 * fix for change table engine for upgrade. 2022-08-04 11:51:03 +08:00
王怡栋 0f9f37e882 Merge branch 'sprint/devplat_30' into 'master'
* Set the value is empty if the value is not setted.

See merge request easycorp/zentaopms!4786
2022-08-04 03:26:55 +00:00
daitingting c5036c1b55 * Set the value is empty if the value is not setted. 2022-08-04 03:22:07 +00:00
王怡栋 0c250672e0 Merge branch 'sgm_kanban' into 'master'
Sgm kanban

See merge request easycorp/zentaopms!4785
2022-08-04 03:13:45 +00:00
wangyidong d06f01a509 * fix bug for upgrade. 2022-08-04 11:11:28 +08:00
sunguangming 6fd31be063 * Fix comment. 2022-08-04 11:04:59 +08:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
sunguangming ab34dbce82 * Code for task #62734. 2022-08-04 11:01:57 +08:00
zhouxudong 4ac799f1d5 * Update Code. 2022-08-04 02:59:02 +00:00
zenggang 9314b23885 * Fix bug#25998,26017 2022-08-04 02:48:29 +00:00
王怡栋 883c61e32a Merge branch 'sprint/222_zhouxudong_62852' into 'sprint/222'
Sprint/222 zhouxudong 62852

See merge request easycorp/zentaopms!4782
2022-08-04 02:43:25 +00:00
zhouxudong e95b8f75a3 * Finish task #62852. 2022-08-04 02:36:12 +00:00
王怡栋 fc494cc0f6 Merge branch 'sprint/221_tianshujie_fixbug' into 'master'
Sprint/221 tianshujie fixbug

See merge request easycorp/zentaopms!4781
2022-08-04 02:34:54 +00:00
zhouxudong 7054e33346 * Finish task #62852. 2022-08-04 02:30:31 +00:00
zhouxudong f3c4e8b26b * Finish task #62852. 2022-08-04 02:24:51 +00:00
zhouxudong 0c29e89833 * Finish task #62852. 2022-08-04 02:16:56 +00:00
刘刚 8f95fc6bb2 Merge branch 'sprint/devplat_30' into 'master'
* Finish task #63385.

See merge request easycorp/zentaopms!4780
2022-08-04 02:16:54 +00:00
liugang 1ce2315792 * Finish task #63385. 2022-08-04 10:15:13 +08:00
王怡栋 4e9d494e78 Merge branch 'master_liuhong_25759' into 'master'
*Fix bug #25759

See merge request easycorp/zentaopms!4776
2022-08-04 02:13:11 +00:00
liuhong c44c768145 *Fix bug #25759 2022-08-04 02:11:40 +00:00