Commit Graph
2143 Commits
Author SHA1 Message Date
liugang 2bbf63e9dc * Finish task #69599. 2022-09-19 15:25:17 +08:00
tanghucheng 30ad85c622 * Finish task #69004. 2022-09-16 16:11:55 +08:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
tanghucheng c58ef703a4 * Finish task #69007. 2022-09-15 15:25:25 +08:00
刘刚 02de591f31 Merge branch 'sprint/239_liugang_fixStyle' into 'zentaopms_239'
* Display the products and the plans on the edit page of the project module if...

See merge request easycorp/zentaopms!5342
2022-09-15 05:13:01 +00:00
liugang fefdfe5b49 * Adjust the vertical align. 2022-09-15 13:07:43 +08:00
liugang 93b221c6a6 * Display the products and the plans on the edit page of the project module if the project has product. 2022-09-15 13:06:23 +08:00
liugang 042a9a97c3 * Display the project type on the edit page of the project module. 2022-09-15 13:05:14 +08:00
liuruogu 04cd8275fe * Finish task #69016. 2022-09-15 02:42:40 +00:00
liugang b45b3e3661 * Finish task #68999. 2022-09-14 14:07:00 +08:00
tianshujie ba5eb3f915 * Finish task #68942,68941. 2022-09-13 14:39:01 +08:00
tianshujie 0d4b77197f * Fix bug #26936. 2022-08-29 14:49:33 +08:00
王怡栋 861242917e Merge branch 'sprint/master_zhouxudong_26612' into 'master'
* Fix bug #26612.

See merge request easycorp/zentaopms!5026
2022-08-19 05:11:53 +00:00
王怡栋 2794dbb783 Merge branch 'sprint/229_zhouxudong_64882' into 'master'
Sprint/229 zhouxudong 64882

See merge request easycorp/zentaopms!5022
2022-08-19 05:11:07 +00:00
zhouxudong 6312af0dea * Fix bug #26612. 2022-08-19 03:11:05 +00:00
zhouxudong 39007e35b2 Merge branch 'sprint/229_zhouxudong_64888' into sprint/229 2022-08-17 07:15:55 +00:00
zhouxudong fea283edf4 * Finish task #64882. 2022-08-17 06:26:44 +00:00
zhouxudong 5c71d7d0b3 * Finish task #63580. 2022-08-17 02:10:45 +00:00
zhouxudong 49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00
zhouxudong 04247b0533 * Finish task #63580. 2022-08-11 07:00:06 +00:00
wangyidong 901d2b95a0 Merge branch 'sprint/master_zhouxudong_code' 2022-08-10 15:29:23 +08:00
lanzongjun 5f34fa4706 * fix bug #26159 2022-08-10 14:49:20 +08:00
zhouxudong 266fdf9ca7 * Update code. 2022-08-10 05:42:26 +00:00
王怡栋 6ba5f3bd67 Merge branch 'master_liuhong_35865' into 'master'
Master liuhong 35865

See merge request easycorp/zentaopms!4857
2022-08-09 05:34:18 +00:00
zhouxudong ef847f1169 * Finish task #63581. 2022-08-08 14:37:33 +00:00
liuhong a2adce2bb6 *Finish task #35865. 2022-08-08 13:39:32 +00:00
lanzongjun 0e75eed65c fix cp project 2022-08-08 18:57:16 +08:00
lanzongjun 5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
lanzongjun 15cce6ebfa fix cp project 2022-08-08 18:18:09 +08:00
zhouxudong abc59ed7aa * Finish task #63679. 2022-08-07 15:21:43 +00:00
zenggang 262ab9e5cd * Fix sprint211 problems. 2022-08-05 05:19:47 +00:00
zhouxudong cf009e9c80 * Reconstruction method. 2022-08-05 01:58:27 +00:00
xieqiyu d69d68f9bd * Fix bug#26045. 2022-08-04 13:34:09 +08:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
zhouxudong 84f3796c88 * Finish task #62850. 2022-08-04 01:53:21 +00:00
zhouxudong ace4fde7a8 * Finish task #62850. 2022-08-04 01:48:56 +00:00
zhouxudong 461e3275db * Finish task #62850. 2022-08-04 01:32:48 +00:00
zhouxudong 9f26275965 * Finish task #62850. 2022-08-04 01:27:07 +00:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
zhouxudong 545f58f944 * Finish task #62850. 2022-08-03 09:25:08 +00:00
wangyuting2 afba28db68 * Add project execution approval menu. 2022-08-03 16:48:10 +08:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
wangyuting2 fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00
zhouxudong 18504478db * Finish task #62850. 2022-08-02 09:39:55 +00:00
zhouxudong 73ec96dc8f * Finish task #62850. 2022-08-02 09:32:21 +00:00
zhouxudong 6a784fdfda * Finish task #62850. 2022-08-02 08:50:16 +00:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
zhouxudong 364a5009f4 * Finish task #62850. 2022-08-02 07:21:03 +00:00
wangyuting2 dc14d91320 * Finish task #63286. 2022-08-02 14:54:20 +08:00
王怡栋 1c2cc0a5c1 Merge branch 'sprint/220_liumengyi_25814' into 'master'
* Fix bug for change tab.

See merge request easycorp/zentaopms!4709
2022-07-28 06:32:13 +00:00