Commit Graph
289 Commits
Author SHA1 Message Date
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
xieqiyu 67a4f16f74 * Fix bug#31685. 2023-01-18 15:12:14 +08:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
孙广明 dc33dd6283 Merge branch 'master_xieqiyu_30891' into 'master'
* Fix bug#30891.

See merge request easycorp/zentaopms!6576
2022-12-16 05:06:37 +00:00
孙广明 9a6929062a * Fix bug #30882. 2022-12-16 11:12:40 +08:00
xieqiyu f17dbd2c68 * Fix bug#30861. 2022-12-16 11:01:03 +08:00
xieqiyu ec6f263bd3 * Code for task#78661. 2022-12-07 21:42:59 +08:00
xieqiyu ae62bdff75 * Code for task#78661. 2022-12-07 14:19:36 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
liugang 7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
liumengyi 64ac87995c * Fix bug #29902. 2022-11-17 08:46:41 +08:00
xieqiyu 85c8e84c79 * Fix bug#29808. 2022-11-15 15:56:34 +08:00
liugang 6c915bb8c2 * Finish task #75077. 2022-11-08 14:22:18 +08:00
liumengyi a38461a20e * Fix bug for manage chart group. 2022-11-06 16:03:14 +08:00
lanzongjun c525d43c1f fix ajax needCreate param 2022-11-03 09:29:50 +08:00
liumengyi ca70d4d63c * Finish task #74322, #74326. 2022-11-01 14:20:57 +08:00
lanzongjun 67737d25c2 * task #74142 2022-11-01 09:58:04 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tanghucheng 645072d3ae * Fix bug #28711. 2022-10-24 14:44:12 +08:00
tanghucheng 14f82baf7e * Fix bug #28639. 2022-10-19 13:57:00 +08:00
tanghucheng 484cffa1a1 * Add ticket module. 2022-10-19 09:33:26 +08:00
tanghucheng 9ea2d135b3 * Fix bug #28624. 2022-10-18 17:29:34 +08:00
tanghucheng ccd017af47 * Finish task #72201,72130,72129. 2022-10-18 15:04:35 +08:00
tanghucheng 2d0901b36c * Add top menu for feedback. 2022-10-15 08:52:40 +08:00
liugang 11f0ca4453 * Optimize the method getPairs of the product module. 2022-09-21 11:10:34 +08:00
liuruogu dfb413dbb8 * Finish task #69600. 2022-09-20 09:02:23 +00:00
liuruogu f21dd89912 * Fix bug #27500. 2022-09-20 05:35:30 +00:00
liuruogu 8d22d737ea * Fix bug #27502. 2022-09-19 06:10:21 +00:00
liuruogu 39b1e8ae45 * Finish task #69016. 2022-09-15 07:08:49 +00:00
lanzongjun 036fe4aeb8 Merge branch 'sprint/feedback_module' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/feedback_module 2022-09-08 10:15:22 +08:00
lanzongjun adde17f712 * fix bug #27317 2022-09-08 10:15:13 +08:00
mayue 087c85c04f * Ajust lang. 2022-09-07 14:49:25 +08:00
lanzongjun 499e5f875a add module tree 2022-09-05 11:33:06 +08:00
lanzongjun 09ec23ea4a add module tree 2022-09-05 11:29:36 +08:00
lanzongjun 2dbf74064c feedback module 2022-09-02 11:37:53 +08:00
mayue 6336e232fb * Optimize code. 2022-08-23 11:01:31 +08:00
mayue 2f2f0e6542 * Optimize code. 2022-08-23 09:33:45 +08:00
mayue b9ac60f75f * Fix bug #26200. 2022-08-22 16:26:16 +08:00
zhujinyong 7e67e54fe9 * Define table. 2022-08-15 11:10:09 +08:00
孙广明 9f1847d55b * Code for code error. 2022-07-20 09:35:30 +08:00
mayue 090989e25e * Fix bug #24404. 2022-07-13 11:11:36 +08:00
mayue f44d5659df * Fix bug #24404. 2022-07-12 15:00:11 +08:00
liumengyi 1681419642 * Fix bug for sort module. 2022-07-08 09:03:00 +08:00
liumengyi bb9ce6dd49 * Fix bug #24920. 2022-07-07 16:58:27 +08:00
王怡栋 14b88ef75e Merge branch 'sprint/211_liumengyi_59469' into 'master'
* Finish task #59469.

See merge request easycorp/zentaopms!4372
2022-07-06 06:17:57 +00:00
liumengyi 100f1daf7e * Add annotation. 2022-07-06 14:10:37 +08:00
liumengyi 957d6f3249 * Fix bug of task #59469. 2022-07-06 11:11:45 +08:00
zhouxudong bf19599c0e * Finish task #59525. 2022-07-06 02:15:33 +00:00
zhouxudong ddecdf5cb8 * Finish task #59525. 2022-07-06 00:31:05 +00:00
liumengyi 2ab56b9f51 * Finish task #59469. 2022-07-05 20:38:07 +08:00