Commit Graph
2167 Commits
Author SHA1 Message Date
Yagami 27b73d7dcd * Code for function review. 2022-12-12 16:16:51 +08:00
Yagami b70f00842f * Finish task #79462. 2022-12-12 10:01:40 +08:00
wangyidong 81d3403a20 * code for task #79279. 2022-12-09 16:54:17 +08:00
孙广明 8981507e80 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688

See merge request easycorp/zentaopms!6515
2022-12-09 06:48:13 +00:00
wangyidong f1b27ca35a * fix bug #30745. 2022-12-09 12:23:09 +08:00
lanzongjun dd2160fde3 * Finish Bug #30662 2022-12-09 11:53:58 +08:00
孙广明 688866a30e Merge branch 'master_xieqiyu_78668' into 'master'
* Finish task#78668.

See merge request easycorp/zentaopms!6488
2022-12-07 05:01:49 +00:00
xieqiyu afe9d49024 * Finish task#78668. 2022-12-07 11:16:55 +08:00
wangyidong 595ec286b6 * adjust for show build path. 2022-12-07 10:34:10 +08:00
wangyidong 0f1de8b84f * code for task #78911 2022-12-06 13:43:17 +08:00
Yagami 55ea43c5aa Merge branch 'zentaopms_256' 2022-12-05 10:36:22 +08:00
wangyidong fdc4c4159f * adjust for icon. 2022-12-05 10:29:48 +08:00
wangyidong 33d2c170fe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-05 10:11:28 +08:00
wangyidong 42e85ebbb8 * code for task #78384. 2022-12-05 10:10:59 +08:00
wangyuting 099eaa8a5e * Finish task #78357. 2022-12-02 07:43:05 +00:00
Yagami b181c11e37 * Fix bug #30476. 2022-12-02 15:00:12 +08:00
Yagami 8cb3e136d3 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-02 10:48:11 +08:00
王怡栋 d1952c69b0 Merge branch 'zentaopms_266_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6446
2022-12-02 02:47:20 +00:00
Yagami 32424d7072 * Finish task #77800. 2022-12-02 10:39:49 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
lanzongjun 59c7949f9a change copyproject to copyProject 2022-12-02 09:53:03 +08:00
lanzongjun 8e1172e955 fix cp project js error 2022-12-02 08:50:07 +08:00
wangyuting e100ad058c * Fix bug. 2022-12-01 09:03:16 +00:00
孙广明 71f18cd3b3 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
fix cp project js error

See merge request easycorp/zentaopms!6442
2022-12-01 07:42:25 +00:00
lanzongjun a13ae45bd1 fix cp project js error 2022-12-01 15:36:17 +08:00
Yagami cfc70e8176 * Code for task #77800. 2022-12-01 15:15:07 +08:00
wangyuting 2bd28233ea * Fix bug #30429. 2022-12-01 06:28:13 +00:00
Yagami 7a843ece37 * Code for task #77800. 2022-12-01 13:52:46 +08:00
Yagami 6263ee7a5c * Code for task #77801. 2022-12-01 10:34:23 +08:00
wangyuting 5c176595e4 * Finish task #77610. 2022-11-30 01:46:45 +00:00
孙广明 1d9b2ce11c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30028#30240#30245

See merge request easycorp/zentaopms!6376
2022-11-25 03:09:48 +00:00
Yagami 84dce924b8 * Code for task #30261. 2022-11-25 11:07:45 +08:00
Yagami efbbaa9918 * Fix bug. 2022-11-25 09:53:17 +08:00
lanzongjun 3e2648ab5e * Fix Bug #30240 2022-11-25 09:34:57 +08:00
Yagami 25e5b27220 * Finish task #77365. 2022-11-25 08:39:24 +08:00
王怡栋 6114d5cfbe Merge branch 'zentaopms_263_bug#30216' into 'master'
* Fix bug #30216.

See merge request easycorp/zentaopms!6372
2022-11-24 07:57:14 +00:00
wangyuting 22f2299bfa * Fix bug #30216. 2022-11-24 07:42:49 +00:00
tanghucheng 3ca705de9f * Adjust code for bug #30011,24060. 2022-11-24 14:58:59 +08:00
Yagami 89d1dd2a3a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-24 13:15:40 +08:00
Yagami 9b0881dd5e * Fix bug for project unlink product. 2022-11-24 13:15:26 +08:00
王怡栋 dc664a3e7a Merge branch 'sprint/master_lanzongjun_fixbug' 2022-11-24 11:17:26 +08:00
lanzongjun 9f692f5b23 * Fix project edit width 2022-11-24 10:17:44 +08:00
lanzongjun eac16b903f * Fix Bug #30156 2022-11-23 16:54:49 +08:00
孙广明 e2571ee150 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30157

See merge request easycorp/zentaopms!6335
2022-11-23 08:01:46 +00:00
lanzongjun 40ee11ba30 * Fix Bug #30157 2022-11-23 15:59:21 +08:00
Yagami 307e9c5f62 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-23 13:44:25 +08:00
Yagami 49581d7ece * Finish task #77252. 2022-11-23 13:43:06 +08:00
wangyuting 9b3e52ac3b * Optimize project build css. 2022-11-23 02:02:13 +00:00
wangyuting 8c6753ea42 * Finish task #77140. 2022-11-22 06:03:51 +00:00
Yagami 02580a0465 * Cannot remove product link when story in execution. 2022-11-22 11:17:40 +08:00