Commit Graph
38781 Commits
Author SHA1 Message Date
tanghucheng 4cf1825350 * Fix bug. 2022-05-13 03:03:33 +00:00
王怡栋 19f37df962 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3381
2022-05-13 01:16:18 +00:00
王怡栋 86f2e56096 Merge branch 'sprint/master_zhouxudong_compile' into 'master'
Sprint/master zhouxudong compile

See merge request easycorp/zentaopms!3355
2022-05-13 01:15:40 +00:00
tanghucheng 5a5f691b37 * Fix bug. 2022-05-13 01:15:30 +00:00
王怡栋 24c8d5f010 Merge branch 'sprint/189_hufangzhou_22407' into 'master'
* Fix bug #22407.

See merge request easycorp/zentaopms!3377
2022-05-13 01:14:26 +00:00
zhouxudong b15b2cc0f5 * Fix a error. 2022-05-13 01:13:30 +00:00
王怡栋 b885f105d2 Merge branch 'sprint/189_hufangzhou_22443' into 'master'
* Fix bug #22443.

See merge request easycorp/zentaopms!3380
2022-05-13 01:04:12 +00:00
zhouxudong 4d84d1c84b * Deleted space. 2022-05-13 01:03:46 +00:00
hufangzhou 74bf099c98 * Fix bug #22443. 2022-05-13 09:02:56 +08:00
李玉春 5b90338ebb Merge branch 'sprint/tianshujie_bug22437' into 'master'
* Fix bug #22437.

See merge request easycorp/zentaopms!3379
2022-05-13 00:59:11 +00:00
zhouxudong c3c455beb5 * Add compile auto test. 2022-05-13 00:58:09 +00:00
zhouxudong 0bf0035780 * Add compile auto test. 2022-05-13 00:55:36 +00:00
zhouxudong ffc0cffc90 * Add compile auto test. 2022-05-13 00:52:55 +00:00
hufangzhou 401ea2f810 * Fix bug #22407. 2022-05-13 08:47:46 +08:00
wangyidong ee559e5e7c * code for bug #22376. 2022-05-13 08:47:42 +08:00
tianshujie 6770b72b11 * Fix bug #22437. 2022-05-13 08:42:26 +08:00
wangyidong 71bc27b631 * fix bug #22433. 2022-05-13 08:27:44 +08:00
wangyidong 50ec57b390 * code for story #32387. 2022-05-12 19:04:44 +08:00
wangyidong 7336b0dabb * code for task #53928. 2022-05-12 18:56:26 +08:00
王怡栋 3f6d438550 Merge branch 'sprint/189_liumengyi_kanban' into 'master'
* Add card desc of productplan card and build card.

See merge request easycorp/zentaopms!3376
2022-05-12 09:24:21 +00:00
liumengyi b3fd6f4f53 * Add card desc of productplan card and build card. 2022-05-12 17:22:10 +08:00
王怡栋 c116f9a9d1 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3372
2022-05-12 09:10:50 +00:00
wangyidong c1cb8211dc Merge branch 'sprint/master_lanzongjun_fixbug' 2022-05-12 17:09:47 +08:00
王怡栋 a47a3ad064 Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-12 09:09:28 +00:00
lanzongjun 24a67405db * add sql 2022-05-12 17:07:58 +08:00
lanzongjun 63bd7e6902 * add sql 2022-05-12 17:04:55 +08:00
孙广明 3e677efa79 Merge branch 'sprint/189_mayue_fixbug#22411' into 'master'
* Fix bug #22411.

See merge request easycorp/zentaopms!3370
2022-05-12 08:53:13 +00:00
mayue 44783b57a5 * Optimize code. 2022-05-12 08:52:17 +00:00
唐胡成 719db9f013 Update update16.5.sql 2022-05-12 08:49:01 +00:00
王怡栋 57b96215b3 Merge branch 'sprint/189_hufangzhou_issue' into 'master'
* Resolve issue #634.

See merge request easycorp/zentaopms!3369
2022-05-12 08:48:06 +00:00
tanghucheng 36d4e294e7 * Fix bug. 2022-05-12 08:46:51 +00:00
王怡栋 42473b2dfb Merge branch 'sprint/tianshujie_bug22436' into 'master'
* Fix bug #22436.

See merge request easycorp/zentaopms!3371
2022-05-12 08:44:42 +00:00
mayue 96b422d247 * Fix bug #22411. 2022-05-12 08:41:39 +00:00
tianshujie 85469bca87 * Fix bug #22436. 2022-05-12 16:34:23 +08:00
hufangzhou 60f8ffd05e * Resolve issue #634. 2022-05-12 16:24:09 +08:00
王怡栋 93e5d9e108 Merge branch 'sprint/wangyuting_workflow' into 'master'
* Fix print extend fields bug.

See merge request easycorp/zentaopms!3362
2022-05-12 07:59:55 +00:00
王怡栋 7a15492b56 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3364
2022-05-12 07:56:03 +00:00
李玉春 d618aea1ee Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3368
2022-05-12 07:55:25 +00:00
王怡栋 125a97d530 Merge branch 'sprint/189_hufangzhou_22429' into 'master'
* Fix bug #22429.

See merge request easycorp/zentaopms!3366
2022-05-12 07:55:10 +00:00
王怡栋 66eb00606e Merge branch 'sprint/189_hufangzhou_22399' into 'master'
* Fix bug #22399.

See merge request easycorp/zentaopms!3367
2022-05-12 07:53:53 +00:00
wangyidong 450a61cf12 * fix bug #22415. 2022-05-12 15:52:24 +08:00
wangyidong aa0f666d41 * adjust for project flow. 2022-05-12 15:52:24 +08:00
hufangzhou a8ce3a757d * Fix bug #22399. 2022-05-12 15:51:02 +08:00
tianshujie 10e48b66d9 * Fix bug #22378. 2022-05-12 15:50:05 +08:00
hufangzhou 4c7619bcb9 * Fix bug #22429. 2022-05-12 15:46:49 +08:00
zhouxudong c902075102 * Add compile auto test. 2022-05-12 07:41:09 +00:00
孙广明 dd4566f1ea Merge branch 'fixbug_sunjun_22349' into 'master'
*Fixbug_sunjun_22349

See merge request easycorp/zentaopms!3356
2022-05-12 07:36:26 +00:00
孙广明 cac35c816c Merge branch 'fixbug_sunjun_22394' into 'master'
*Fixbug_sunjun_22394

See merge request easycorp/zentaopms!3363
2022-05-12 07:36:17 +00:00
孙广明 f4724390f6 Merge branch 'sunhuawei_fixbug' into 'master'
*解决功能演示过程中出现的问题。

See merge request easycorp/zentaopms!3365
2022-05-12 07:36:01 +00:00
孙华伟 a3ab4a596b *解决功能演示过程中出现的问题。 2022-05-12 15:29:28 +08:00