Commit Graph
617 Commits
Author SHA1 Message Date
tanghucheng 3ca705de9f * Adjust code for bug #30011,24060. 2022-11-24 14:58:59 +08:00
lanzongjun 1d4a337af8 * Fix Task #77262 2022-11-22 16:49:32 +08:00
lanzongjun 284b748e7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-11-22 15:45:19 +08:00
lanzongjun 54d3819cb6 * Fix Task #77266 2022-11-22 15:06:30 +08:00
mayue 55893ac556 * Fix bug #30015. 2022-11-21 16:01:06 +08:00
tanghucheng bacdc498f8 * Fix bug #30011. 2022-11-21 11:19:59 +08:00
tanghucheng 2607d0e3ac * Fix bug #24065,23090. 2022-11-18 14:56:56 +08:00
daitingting d032dccb9d * Fix bug #29658. 2022-11-17 02:02:07 +00:00
daitingting 40ff070bc9 * Fix bug #29652. 2022-11-16 09:15:15 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyuting2 ce602cc78e * Finish task #73061. 2022-10-24 08:00:00 +00:00
tianshujie 9c05622f2f * Finish task #70498. 2022-10-11 10:05:22 +08:00
liugang 99921d5433 * Fix compatible bug. 2022-10-09 10:50:59 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
liuyongkai d21a3f8d26 * Fix bug #28078. 2022-09-29 05:23:53 +00:00
tianshujie 6c4b6cd906 * Finish task #70017. 2022-09-28 13:54:52 +08:00
tianshujie 92eb14d26e * Finish task #70015. 2022-09-26 16:13:39 +08:00
tianshujie e56cac6b7a * Finish task #70015. 2022-09-26 14:57:23 +08:00
曹延义 8eef51bf19 * Fix bug #27856. 2022-09-23 11:22:58 +08:00
tanghucheng 710b11ff0c * Finish task #69001. 2022-09-14 17:16:53 +08:00
wangyidong ee148d3a0e * fix bug #27447. 2022-09-13 15:29:55 +08:00
xieqiyu 8fe84e651f * Modify submit review icon. 2022-09-09 13:23:09 +08:00
xieqiyu 052556f908 * Fix bug#27354. 2022-09-08 11:28:18 +08:00
xieqiyu 6768c63f62 * Fix bug. 2022-09-01 12:15:09 +08:00
王怡栋 58c0d43da5 Merge branch 'master_xieqiyu_66955' into 'master'
Master xieqiyu 66955

See merge request easycorp/zentaopms!5219
2022-09-01 03:05:12 +00:00
xieqiyu 0d321210c5 * Code for task#66954. 2022-08-31 20:05:42 +08:00
mayue c1c4a8349b * Optimize code. 2022-08-31 17:10:08 +08:00
mayue 8d7cc56826 * Fix bug #27112. 2022-08-31 17:03:08 +08:00
xieqiyu 0cd8ce30cd * Finish task#66954,#66960,#66959,#66958,#66956. 2022-08-31 12:35:45 +08:00
tanghucheng 8514669f10 * Fix bug #26996. 2022-08-29 15:15:57 +08:00
王怡栋 5580dd55d9 Merge branch 'master_liuhong' into 'master'
*Fix bug

See merge request easycorp/zentaopms!5122
2022-08-26 02:10:06 +00:00
王怡栋 7b8333da4e Merge branch 'master_xieqiyu_26878' into 'master'
* Fix bug#26878.

See merge request easycorp/zentaopms!5123
2022-08-26 01:21:00 +00:00
xieqiyu 01956d14b3 * Fix bug#26878. 2022-08-26 08:08:16 +08:00
liuhong d1576572ff *Fix bug 2022-08-25 06:49:05 +00:00
xieqiyu 6245e04233 * Fix bug#26870. 2022-08-25 14:45:02 +08:00
xieqiyu 14ce3c97f9 * Fix bug#26804,26797. 2022-08-24 22:43:27 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
liuhong e863a2c792 *Fix bug 64879. 2022-08-19 05:30:24 +00:00
王怡栋 e8654f20a9 Merge branch 'master' into 'sprint/zentaomax42'
# Conflicts:
#   db/update17.5.sql
2022-08-19 02:34:50 +00:00
lanzongjun 039d4a4e19 * fix bug #23932 2022-08-19 09:23:18 +08:00
liuhong 06e7729212 *Fix bug 2022-08-19 00:47:06 +00:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
tanghucheng ca66cb5d7f * Finish task #64938. 2022-08-17 21:46:02 +08:00
tanghucheng eaaf6e7498 * Update lang for lite. 2022-08-16 14:00:50 +08:00
tanghucheng 68f35f5262 * Fix bug #26520,26520. 2022-08-16 13:58:19 +08:00
tanghucheng d3314f22aa * Fix bug #26256. 2022-08-16 09:28:41 +08:00