Commit Graph
1109 Commits
Author SHA1 Message Date
李玉春 bd3999375c Merge branch 'sprint/224_tianshujie_case' into 'master'
Sprint/224 tianshujie case

See merge request easycorp/zentaopms!4962
2022-08-15 00:13:45 +00:00
tianshujie ab19aa2d46 * Add a null judgment to the method. 2022-08-13 17:15:06 +08:00
王怡栋 1f1242ca9c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
add cp gantt task move

See merge request easycorp/zentaopms!4953
2022-08-12 09:06:24 +00:00
lanzongjun 0c117ef702 add gantt move order 2022-08-12 16:49:27 +08:00
lanzongjun 9fa80dcd94 add cp gantt task move 2022-08-12 16:15:08 +08:00
liumengyi 8dc2999075 * Fix bug #26379. 2022-08-12 15:44:01 +08:00
hufangzhou e97a5a7361 * Add the new version. 2022-08-11 10:55:29 +08:00
王怡栋 ed951dc12e Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade

See merge request easycorp/zentaopms!4835
2022-08-08 03:25:42 +00:00
mayue 0b362d4061 * Add lang . 2022-08-08 11:23:36 +08:00
mayue fc0a0b2d61 * Optimize code. 2022-08-08 10:56:43 +08:00
lanzongjun 9c6356fded debug 2022-08-05 15:50:24 +08:00
lanzongjun 408150ff5c debug 2022-08-05 15:40:25 +08:00
liumengyi 18d1bc47fb * Fix issue #706. 2022-08-05 10:24:09 +08:00
wangyidong 7796bc8499 Merge branch 'sprint/devplat_30' 2022-08-05 08:46:26 +08:00
daitingting 73810a1e26 * Fix bug #25943. 2022-08-04 08:14:08 +00:00
liumengyi 66990b3fc9 * Fix bug #25965. 2022-08-03 13:14:45 +08:00
tanghucheng b88cbfa913 * Code for get history log. 2022-08-02 08:54:40 +08:00
liumengyi f9c408db4c * Fix bug for dynamic view. 2022-07-27 09:20:58 +08:00
caoyanyi 542156de2a * Add actions. 2022-07-26 14:54:48 +08:00
liumengyi 8d9aace2de * Fix bug. 2022-07-22 13:42:08 +08:00
liumengyi d83ed1092d * Fix bug #25554. 2022-07-22 13:17:18 +08:00
liumengyi 374ec6f55d * Fix bug #25554. 2022-07-22 11:06:51 +08:00
王怡栋 0420767f2f Merge branch 'sprint/217_25551' into 'master'
* Fix bug#25551,25591,25593

See merge request easycorp/zentaopms!4627
2022-07-22 02:20:54 +00:00
zenggang c368f63f6d * Adjust code 2022-07-22 02:01:47 +00:00
liumengyi 0d7bc07e69 * Optimize code for bug #25559. 2022-07-21 17:40:26 +08:00
liumengyi 9be334f34b * Fix bug #25554, #25558, #25559, #25570. 2022-07-21 17:38:27 +08:00
liumengyi 14cf90f0e5 * Fix bug #25554, #25558, #25559, #25570. 2022-07-21 17:24:51 +08:00
zenggang 27e19c459a * Fix bug#25551 2022-07-21 08:23:50 +00:00
zenggang 0655809533 * Fix sprint217 bugs. 2022-07-21 04:06:11 +00:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
王怡栋 d349931e82 Merge branch 'sprint/217_liumengyi_61171' into 'master'
* Finish task #61171, #61170.

See merge request easycorp/zentaopms!4610
2022-07-20 06:23:40 +00:00
liumengyi 45eb1e2f99 * Fix bug for task #61171. 2022-07-20 13:54:23 +08:00
liumengyi ecada98f89 * Fix bug for task #61171. 2022-07-20 13:15:34 +08:00
liumengyi d73346c395 * Finish task #61171, #61170. 2022-07-19 15:22:38 +08:00
liyuchun 07f8b57e68 * Fix bug #25153. 2022-07-15 05:28:09 +00:00
caoyanyi c8527bdea4 Merge branch 'master' into zenops_38 2022-07-14 08:37:24 +08:00
朱金勇 ca9adecd3f Merge branch 'sprint/xuanxuan_108' into 'master'
合并小喧喧通知卡片相关代码

See merge request easycorp/zentaopms!4452
2022-07-13 05:58:05 +00:00
liyuchun 6cef93edd9 * Finish task #60453. 2022-07-12 06:30:13 +00:00
sunjun 1404449da1 sprint/211_sunjun_60474 2022-07-11 09:09:29 +00:00
caoyanyi 8267cfaa94 * Fix bug #25032. 2022-07-08 13:50:23 +08:00
tianshujie 2c6aeb6c19 * Fix bug #25014. 2022-07-08 10:15:18 +08:00
王怡栋 a97b35f2bc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* code rollback

See merge request easycorp/zentaopms!4410
2022-07-07 08:13:20 +00:00
lanzongjun f51027b090 * fix bug #24280 2022-07-07 16:06:48 +08:00
liumengyi 9e5a0ff356 * Fix bug for task #59469. 2022-07-07 12:06:41 +08:00
liumengyi 7c2eae9399 * Fix bug of task #59469. 2022-07-06 13:22:01 +08:00
liumengyi 957d6f3249 * Fix bug of task #59469. 2022-07-06 11:11:45 +08:00
liumengyi f6169c53b5 * Finish task #59469. 2022-07-05 20:47:47 +08:00
liumengyi 2ab56b9f51 * Finish task #59469. 2022-07-05 20:38:07 +08:00
chaideqing 5965752003 * adjust xuanxuan notification center logic, task #58691 2022-07-01 16:27:40 +08:00
孙广明 50dce20f6f * Code for action error. 2022-06-29 16:20:07 +08:00