Commit Graph
28215 Commits
Author SHA1 Message Date
liyuchun cfdce3652f * Finish task #43187. 2021-10-14 13:51:47 +08:00
王怡栋 ad21350632 Merge branch 'sprint/167_sgm_15489' into 'sprint/167'
* Fix bug #15489.

See merge request easycorp/zentaopms!57
2021-10-14 03:32:18 +00:00
孙广明 fb086df41b Merge branch 'sprint/167_zenggang_15490' into 'sprint/167'
* Fix bug#15490

See merge request easycorp/zentaopms!62
2021-10-14 01:03:14 +00:00
zenggang dbe27dff42 * Fix bug#15490 2021-10-13 08:13:02 +00:00
李玉春 5ba5ad9305 Merge branch 'sprint/167_xieqiyu_43173' into 'sprint/167'
* Finish task#43173.

See merge request easycorp/zentaopms!59
2021-10-13 07:31:18 +00:00
xieqiyu 64c4e31370 * Code for task#43173. Modify variable name. 2021-10-13 15:28:22 +08:00
xieqiyu a28498a56b * Finish task#43173. 2021-10-13 14:53:33 +08:00
李玉春 26026cbf89 Merge branch 'sprint/167_xieqiyu_43168' into 'sprint/167'
* Finish task#43168.

See merge request easycorp/zentaopms!58
2021-10-13 03:10:29 +00:00
xieqiyu 8b8544d129 * Finish task#43168. 2021-10-13 10:10:05 +08:00
孙广明 0f546a39e2 * Fix bug #15489. 2021-10-13 09:10:12 +08:00
朱金勇 4d208b36a6 Merge branch 'spirnt/167_liyuchun_43178' into 'sprint/167'
* Finish task #43178.

See merge request easycorp/zentaopms!48
2021-10-13 00:55:20 +00:00
李玉春 aa9252f50b Merge branch 'sprint/167_xieqiyu_43168' into 'sprint/167'
* Finish task#43168.

See merge request easycorp/zentaopms!56
2021-10-13 00:42:34 +00:00
李玉春 79fc550337 Merge branch 'sprint/167_xieqiyu_43173' into 'sprint/167'
* Finish task#43173.

See merge request easycorp/zentaopms!55
2021-10-13 00:41:49 +00:00
xieqiyu 973ec92d4a * Add spaces. 2021-10-13 08:36:23 +08:00
xieqiyu 697be11443 * Finish task#43168. 2021-10-13 08:28:16 +08:00
李玉春 01b777c445 Merge branch 'sprint/167_hufangzhou_43188' into 'sprint/167'
* Finish task #43188.

See merge request easycorp/zentaopms!51
2021-10-13 00:27:43 +00:00
朱金勇 8fa2e839fb Merge branch 'sprint/167_tianshujie_43190' into 'sprint/167'
*Finish task #43190

See merge request easycorp/zentaopms!50
2021-10-12 14:02:03 +00:00
xieqiyu ac415b67aa * Finish task#43173. 2021-10-12 11:05:23 +08:00
hufangzhou 7a1fa1ef3b * Finish task #43188. 2021-10-11 16:11:48 +08:00
tianshujie d69aeae3b9 * Adjust the style of the project list under the product. 2021-10-11 15:58:09 +08:00
liyuchun a588e38cbc * Finish task #43178. 2021-10-11 14:58:22 +08:00
tianshujie 1af5598b1a * Finish task #43190. 2021-10-11 14:53:53 +08:00
王怡栋 e5132dcc3e Merge branch '165' 2021-10-11 14:20:07 +08:00
王怡栋 f5f9772e08 Merge branch 'sprint/165_test' into 165 2021-10-11 14:15:54 +08:00
liyuchun cf687f3ee5 * Adjust of zt_dept. 2021-10-11 08:51:56 +08:00
朱金勇 c280d772c2 Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* fix for todo data.

See merge request easycorp/zentaopms!46
2021-10-10 14:13:27 +00:00
朱金勇 b90e78d4c9 Merge branch 'sprint/165_liyuchun_42859' into 'sprint/165'
* Finish task #42859,modify the syntax of Notification.

See merge request easycorp/zentaopms!47
2021-10-10 12:08:18 +00:00
dingna f7cd95e318 * Modify desc of products. 2021-10-09 16:54:01 +08:00
dingna 1ac46abd23 * Modify name of products. 2021-10-09 15:29:20 +08:00
liyuchun 5945717a55 * Fix bug #42859. 2021-10-09 15:22:57 +08:00
dingna 5d94e8e207 * Modify product of branch and add created time for products. 2021-10-09 14:47:41 +08:00
孙广明 bb268a2bf6 * Merge code. 2021-10-09 13:56:42 +08:00
hufangzhou e23e7975a3 Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test 2021-10-09 13:20:44 +08:00
hufangzhou a187e11d52 * Modify the name of build and release in yaml file. 2021-10-09 13:20:38 +08:00
xieqiyu 40a362c7f2 * Add data of deleted products. 2021-10-09 13:13:19 +08:00
hufangzhou 39d8d91ade Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test 2021-10-09 10:51:05 +08:00
hufangzhou 948c0ef88a Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test 2021-10-09 10:50:43 +08:00
hufangzhou 0e15bc92cb * Modify the build yaml and release yaml. 2021-10-09 10:50:34 +08:00
tianshujie 988dcea07e * Add independent project linked product data. 2021-10-09 10:50:03 +08:00
王怡栋 e99daf2900 * fix for todo data. 2021-10-09 10:41:00 +08:00
孙广明 7045bcfcac * Adjust productplan and user yaml. 2021-10-09 10:40:27 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
xieqiyu 267fd9b1d4 * Delete the owner of the product with the same project name. 2021-10-09 10:05:16 +08:00
zhujinyong 6abe8d32a2 Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_test 2021-10-09 09:34:05 +08:00
dingna d3611fd8a9 * Add products with the same name as project. 2021-10-09 09:32:33 +08:00
朱金勇 ff09127219 Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.

See merge request easycorp/zentaopms!41
2021-10-09 01:32:30 +00:00
zhujinyong bc33f19a67 + Add postfix for debug. 2021-10-09 09:30:16 +08:00
王怡栋 0fa52d3318 * adjust for review code. 2021-10-09 09:29:10 +08:00
tianshujie 3f163029be Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_test 2021-10-09 09:25:34 +08:00
tianshujie fd80fb2889 * Fixed zt_block table for inserting data. 2021-10-09 09:23:01 +08:00