Commit Graph
3214 Commits
Author SHA1 Message Date
孙广明 47796aa876 Merge branch 'sprint/zentaopms262_mayue_bug#29684' into 'master'
* Fix bug #29684.

See merge request easycorp/zentaopms!6268
2022-11-21 02:28:08 +00:00
mayue d0908ccdde * Fix bug #29684. 2022-11-21 10:26:37 +08:00
Yagami 66bc58139f * Finish task #76486. 2022-11-21 10:23:28 +08:00
孙广明 9ec22b0b7d Merge branch 'sprint/zentaopms262_mayue_bug#29687' into 'master'
* Fix bug #29687.

See merge request easycorp/zentaopms!6259
2022-11-18 11:23:39 +00:00
mayue d264eb022c * Fix bug #29687. 2022-11-18 16:25:18 +08:00
王怡栋 7961c8bc55 Merge branch 'master_feedback_1468' into 'master'
Master feedback 1468

See merge request easycorp/zentaopms!6251
2022-11-18 07:22:01 +00:00
王怡栋 68eb73e7ff Merge branch 'zentaopms_261_bug_#29977' into 'master'
* Fix bug #29977.

See merge request easycorp/zentaopms!6250
2022-11-18 07:21:02 +00:00
王怡栋 1c0129945c * code for task #76439,76440. 2022-11-18 14:25:24 +08:00
daitingting 50975af558 * Fix bug #29977. 2022-11-18 04:02:20 +00:00
liuhong 1b10f6141a * Fix bug foe feedback #1468 2022-11-18 03:10:12 +00:00
liuhong 51f8bf37d6 * Resolved feedback #1468. 2022-11-18 02:06:16 +00:00
王怡栋 6425496407 Merge branch 'zentaopms261_wyd' 2022-11-17 09:55:27 +08:00
王怡栋 6c0a92fa65 * adjust for sync build to release. 2022-11-17 09:40:51 +08:00
王怡栋 0fdbf58dc9 * adjust code. 2022-11-16 17:09:07 +08:00
王怡栋 f4452f6d04 * fix for link story and bug for project release. 2022-11-16 17:06:12 +08:00
王怡栋 cc1300242b Merge branch 'zentaopms_258_bug#29708' into 'master'
* Fix bug #29708.

See merge request easycorp/zentaopms!6182
2022-11-16 03:14:31 +00:00
wangyuting d6488a7e0f * Fix bug #29708. 2022-11-16 02:29:06 +00:00
王怡栋 5a11d47992 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75921

See merge request easycorp/zentaopms!6176
2022-11-16 02:04:10 +00:00
lanzongjun 2f7e39685c * finish task #75921 2022-11-16 09:34:31 +08:00
王怡栋 6fc2d1bd23 Merge branch 'master_feedback_1422' into 'master'
* Resolved feedback #1422.

See merge request easycorp/zentaopms!6160
2022-11-15 08:31:10 +00:00
lanzongjun 69bd73c271 * finish task #76338 2022-11-15 15:04:22 +08:00
lanzongjun d3887137bc * finish task #76338 2022-11-15 11:16:11 +08:00
liuhong d7f9d55863 * Resolved feedback #1422. 2022-11-15 02:15:12 +00:00
王怡栋 72ad339e22 Merge branch 'zentaopms_258_task#76032' into 'master'
Zentaopms 258 task#76032

See merge request easycorp/zentaopms!6138
2022-11-14 09:06:29 +00:00
王怡栋 af8098e545 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-14 16:20:31 +08:00
王怡栋 27086ff4a2 * fix bug. 2022-11-14 16:20:23 +08:00
wangyuting bb5b3426f6 * Finish task #76032. 2022-11-14 07:55:25 +00:00
王怡栋 e97e7ab9b5 * code for task #76034,76033. 2022-11-14 14:34:07 +08:00
wangyidong 8a178c72fe * adjust for project release link story and bug. 2022-11-11 10:47:01 +08:00
tanghucheng e09a070318 * Merge branch 'master' into transfer. 2022-11-09 15:44:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
xieqiyu e5accc3154 * Fix bug#29356. 2022-11-07 06:54:28 +00:00
孙广明 5c4cb5b1e2 Merge branch 'cyy_bug' into 'master'
* Hide pri style when value is null.

See merge request easycorp/zentaopms!6028
2022-11-04 01:53:41 +00:00
Yagami 5aafd5241f * Fix bug #29246. 2022-11-04 09:22:38 +08:00
caoyanyi 829408cc5e * Hide pri style when value is null. 2022-11-04 08:37:35 +08:00
liumengyi e84e6ac11d * Fix bug of bug link bugs. 2022-11-03 09:51:16 +08:00
zhouxin 66fef9275a * Adjust code. 2022-11-02 15:50:38 +08:00
zhouxin 73e1c524c8 * Adjust testcase to bug. 2022-11-02 15:42:21 +08:00
liuyongkai 9685f4b186 * Resolve feedback #1318. 2022-11-01 07:31:11 +00:00
孙广明 71fe0efe0b Merge branch 'feedback_zhouxin_1255' into 'master'
* Resolve feedback #1225.

See merge request easycorp/zentaopms!5915
2022-10-27 06:22:08 +00:00
zhouxin 11ebfea800 * Resolve feedback #1225. 2022-10-27 13:44:44 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
caoyanyi 38e718f83f * Fix bug #28995. 2022-10-27 09:02:02 +08:00
caoyanyi 6a6cfaa453 * Adjust code. 2022-10-26 10:01:26 +08:00
caoyanyi e2a8f5a0fe * Modify view page style. 2022-10-26 09:56:57 +08:00
caoyanyi a82cc215ba * Optimize page style. 2022-10-25 14:53:46 +08:00
tanghucheng ea173ebc4d * Fix bug export. 2022-10-25 14:53:46 +08:00
王怡栋 aa49a5bbd3 Merge branch 'zentaopms_239_task_#72984' into 'zentaopms_239'
* Finish task #72984.

See merge request easycorp/zentaopms!5883
2022-10-25 05:08:33 +00:00
daitingting 1aa860c972 * Finish task #72984. 2022-10-25 03:24:04 +00:00
daitingting 9825419bd4 * Finish task #73066. 2022-10-25 02:06:30 +00:00