Commit Graph
49145 Commits
Author SHA1 Message Date
xieqiyu 63149fd719 * Finish task#81540. 2022-12-29 15:53:34 +08:00
兰宗俊 9f857c92f3 Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #81166

See merge request easycorp/zentaopms!6650
2022-12-29 07:45:56 +00:00
lanzongjun b3c3ca18ad * Finish Task #81166 2022-12-29 15:43:47 +08:00
孙广明 eb7dce8e88 * Fix code style. 2022-12-29 15:21:59 +08:00
孙广明 b41cae08a0 Merge branch 'zentaopms_277_tanghucheng' into 'zentaopms_277'
* Fix issue for gantt icon.

See merge request easycorp/zentaopms!6647
2022-12-29 06:25:35 +00:00
tanghucheng ad83873794 * Fix issue for gantt icon. 2022-12-29 14:22:59 +08:00
孙广明 9b3d6387a5 * Finish task #81192. 2022-12-29 10:55:03 +08:00
xieqiyu cb75585308 * Fix bug#30697. 2022-12-29 10:24:04 +08:00
xieqiyu 4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +08:00
xieqiyu bb0c7167c9 * Code for task#81187. 2022-12-28 14:20:57 +08:00
xieqiyu 260e043338 * Code for task#81187. 2022-12-28 13:40:27 +08:00
刘洪 5cfe9f1418 Merge branch '280_liuhong_81189' into 'zentaopms_277'
* Finish task 81189.

See merge request easycorp/zentaopms!6642
2022-12-28 03:02:01 +00:00
liuhong 970dc71b2e * Finish task 81189. 2022-12-28 01:33:35 +00:00
xieqiyu 05f2d7665b * Finish task#81193. 2022-12-27 20:22:32 +08:00
刘洪 42d0ec1b53 Merge branch 'sprint_liuhong_bug1' into 'zentaopms_277'
* Fix bug.

See merge request easycorp/zentaopms!6639
2022-12-27 08:05:22 +00:00
liuhong 36d1fdef10 * Fix bug. 2022-12-27 08:01:51 +00:00
xieqiyu 2664a0c85e * Finish task#81190. 2022-12-27 13:49:08 +08:00
孙广明 bfc802bc42 * Code for task #81185. 2022-12-27 13:31:54 +08:00
孙广明 7af9dc0d83 * Merge code. 2022-12-27 13:22:35 +08:00
liuhong c018475249 * Fix bug for sql. 2022-12-27 02:24:17 +00:00
刘洪 876363eb7c Merge branch 'sprint_bug_30940' into 'zentaopms_277'
* Fix bug #30940.

See merge request easycorp/zentaopms!6630
2022-12-26 04:17:29 +00:00
liuhong 8c1b9bf90d * Fix bug #30940. 2022-12-26 04:15:11 +00:00
刘洪 563e737169 Merge branch 'sprint_bug_30899' into 'zentaopms_277'
* Fix bug #30899.

See merge request easycorp/zentaopms!6625
2022-12-26 02:17:22 +00:00
liuhong 81b6fec57f * Fix bug #30899. 2022-12-26 00:53:49 +00:00
孙广明 3e9aee30f5 Merge branch 'sprint_bug' into 'zentaopms_277'
* Fix bug #31141 #31140.

See merge request easycorp/zentaopms!6620
2022-12-23 02:24:19 +00:00
孙广明 952b67636f * Fix code style. 2022-12-22 16:33:24 +08:00
liuhong 469bd86d34 * Fix bug #31141 #31140. 2022-12-22 07:58:47 +00:00
孙广明 32fbcfaabf * Fix bug #31129. 2022-12-22 15:22:11 +08:00
孙广明 323e4c8bbe Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #80491

See merge request easycorp/zentaopms!6615
2022-12-22 06:42:20 +00:00
孙广明 19d93a07d6 * Add ticket api. 2022-12-22 14:30:12 +08:00
lanzongjun 795dc6c13b * Finish Task #80491 2022-12-22 10:52:01 +08:00
孙广明 9b6de26c32 Merge branch '277_liuhong_80489' into 'zentaopms_277'
* Finish task #80489.

See merge request easycorp/zentaopms!6613
2022-12-22 02:16:17 +00:00
孙广明 8769553d1a Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #80486

See merge request easycorp/zentaopms!6614
2022-12-22 02:14:53 +00:00
lanzongjun 9b9670acd9 * Finish Task #80486 2022-12-22 10:12:01 +08:00
liuhong fca70f5855 * Code for task #80849. 2022-12-22 01:33:04 +00:00
liuhong f1baa412b1 * Finish task #80489. 2022-12-22 00:51:38 +00:00
孙广明 e527505eb4 Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #80474

See merge request easycorp/zentaopms!6611
2022-12-21 08:26:24 +00:00
lanzongjun a0c3ad9f03 * Finish Task #80474 2022-12-21 16:02:01 +08:00
孙广明 b3e194065b * Add upgrade sql. 2022-12-21 10:59:05 +08:00
孙广明 57cdd90174 Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #80491

See merge request easycorp/zentaopms!6605
2022-12-21 02:45:49 +00:00
lanzongjun 73b44f6bdd * Finish Task #80491 2022-12-20 18:03:52 +08:00
lanzongjun 80c4c018ba Merge branch 'zentaopms_277' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms277_lanzongjun 2022-12-20 15:57:19 +08:00
孙广明 ce11636819 Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #80475

See merge request easycorp/zentaopms!6601
2022-12-20 05:53:43 +00:00
lanzongjun f43487d870 Merge branch 'zentaopms_277' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms277_lanzongjun 2022-12-20 11:04:35 +08:00
lanzongjun 7df0a42da7 * Finish Task #80475 2022-12-20 11:03:41 +08:00
xieqiyu e5e8ecaa68 * Code for task#80490. 2022-12-19 16:05:17 +08:00
胡方舟 9ff12a3a07 Merge branch 'fix_local_upgrade' into 'master'
- Remove useless code for local upgrade.

See merge request easycorp/zentaopms!6589
2022-12-19 02:56:25 +00:00
Lufei 9ca8e975c3 - Remove useless code for local upgrade. 2022-12-19 10:55:05 +08:00
胡方舟 ed83ba0142 Merge branch 'bugfix/liwenrui/zentaoxxmake' into 'master'
* fix makefile for zentaoxx.

See merge request easycorp/zentaopms!6587
2022-12-19 01:54:03 +00:00
文睿 李 098954ef7d * fix makefile for zentaoxx. 2022-12-19 01:52:37 +00:00