Commit Graph
29298 Commits
Author SHA1 Message Date
王怡栋 4f6834011c * fix bug for revert team when edit project. 2022-02-28 14:21:45 +08:00
tianshujie 9071214c7f * Fix bug #19834. 2022-02-28 11:23:52 +08:00
朱金勇 b6810e0b24 Merge branch 'sgm_upgrade' into 'master'
* Remove unused code.

See merge request easycorp/zentaopms!2003
2022-02-28 03:17:09 +00:00
孙广明 cc7e29e208 * Remove unused code. 2022-02-28 11:14:49 +08:00
Zongjun Lan 8dd88cb766 * fix task 49335 2022-02-28 11:02:52 +08:00
孙广明 6b1c882cac * Fix upgrade lang. 2022-02-28 10:16:30 +08:00
tianshujie 941bba2658 * Modify the repeated upgrade problem. 2022-02-28 09:51:53 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
孙广明 ec16236bb5 * Fix upgrade bug. 2022-02-28 08:45:04 +08:00
liumengyi 51ef04f29c * FIx bug #19924. 2022-02-25 15:58:26 +08:00
hufangzhou 9640120b43 * Can not use vision field of zt_action table when upgrade. 2022-02-25 15:28:15 +08:00
孙广明 3627387370 Merge branch 'sprint/185_mayue_49285' into 'sprint/185'
* Finish task#49285.

See merge request easycorp/zentaopms!1871
2022-02-25 06:32:20 +00:00
mayue 37a9564c95 * Optimize code. 2022-02-25 14:20:37 +08:00
mayue c3ef97bf47 * Optimize code. 2022-02-25 14:15:25 +08:00
mayue 245542e972 * Optimize code. 2022-02-25 14:00:54 +08:00
孙广明 8f89f4d64f Merge branch '185_sunhuawei_story_30529' into 'sprint/185'
185 sunhuawei story 30529

See merge request easycorp/zentaopms!1958
2022-02-25 05:45:27 +00:00
孙华伟 68ef9809dd * 2022-02-25 13:37:32 +08:00
孙广明 7ba3ed1dfc Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.

See merge request easycorp/zentaopms!1980
2022-02-25 05:26:24 +00:00
zhengrunyu 748fbfe340 * Fix bug. 2022-02-25 13:24:30 +08:00
mayue c763f12188 * Optimize code. 2022-02-25 13:20:18 +08:00
zhengrunyu 10d7e4cdec * Fix bug. 2022-02-25 13:15:54 +08:00
songchenxuan a2a4ec8d6f *Translate. 2022-02-25 11:16:41 +08:00
孙华伟 0067119fbe *Fix bug #19959 #19963 2022-02-25 11:08:38 +08:00
孙华伟 47e2415b16 *Fix bug #19959 #19963 . 2022-02-25 11:06:20 +08:00
zhengrunyu b641170d85 * Fix bug 19941 19923 19922 19787. 2022-02-25 11:01:31 +08:00
孙广明 4f1ed945dc Merge branch 'sprint/186_tianshujie_20045' into 'sprint/185'
* Fix bug #20045.

See merge request easycorp/zentaopms!1978
2022-02-25 02:47:32 +00:00
tianshujie 9e9181ccfb * Fix bug #20045. 2022-02-25 10:44:53 +08:00
王怡栋 cea8238b79 Merge branch 'sgm_upgrade' into 'sprint/185'
* Add pro version.

See merge request easycorp/zentaopms!1977
2022-02-25 02:34:05 +00:00
孙广明 583550ecb2 * Add pro version. 2022-02-25 10:31:39 +08:00
王怡栋 a0e8f5fcb0 Merge branch 'sprint/185_lanzongjun_49334' into 'sprint/185'
* move to extension

See merge request easycorp/zentaopms!1975
2022-02-25 02:22:09 +00:00
王怡栋 daf275c9f9 Merge branch 'sgm_upgrade' into 'sprint/185'
* Fix upgrade.

See merge request easycorp/zentaopms!1973
2022-02-25 02:16:05 +00:00
Zongjun Lan 3d24613524 * move to extension 2022-02-25 10:01:16 +08:00
孙广明 fd9e6fb79d * Fix upgrade. 2022-02-25 09:28:16 +08:00
王怡栋 19b2d74e48 Merge branch 'sgm_upgrade' into 'sprint/185'
* Add version.

See merge request easycorp/zentaopms!1971
2022-02-25 01:23:08 +00:00
tianshujie ecf679aeaf * Fix the problem of calling config error in static method. 2022-02-25 09:12:19 +08:00
孙广明 3989ed849b * Add version. 2022-02-25 09:09:48 +08:00
孙广明 353e3bc11a * Add version. 2022-02-25 09:05:58 +08:00
孙广明 25f71e0a51 Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify'
# Conflicts:
#   module/task/model.php
2022-02-25 00:41:58 +00:00
孙华伟 e7920e73b4 * 2022-02-25 08:38:25 +08:00
孙广明 c8ba9488c6 Merge branch 'sprint/185_zhouxin_20032' into 'sprint/185'
Fix bug.

See merge request easycorp/zentaopms!1967
2022-02-24 09:23:53 +00:00
zhouxin 7ae4495abb Fix bug. 2022-02-24 09:21:58 +00:00
liumengyi d605fd3f2d * Modify project config edition. 2022-02-24 17:20:50 +08:00
王怡栋 a6c782de7b Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* move to extension

See merge request easycorp/zentaopms!1963
2022-02-24 09:06:41 +00:00
孙广明 32f322ec51 Merge branch 'sprint/186_tianshujie_version' into 'sprint/185'
Sprint/186 tianshujie version

See merge request easycorp/zentaopms!1960
2022-02-24 09:04:10 +00:00
tianshujie 9f76842034 * Modify the code format. 2022-02-24 17:03:19 +08:00
Zongjun Lan 2cc1105512 * fix move extensions to module 2022-02-24 16:59:39 +08:00
zhouxudong 6559ada4a4 * Fix bug #19363. 2022-02-24 16:54:04 +08:00
songchenxuan b4a5b7bff2 *Translate. 2022-02-24 16:52:16 +08:00
tianshujie 34752d2c04 * Modify version judgment logic. 2022-02-24 16:49:56 +08:00
zhouxudong ed2c8c0b0a * Fix bug #19363. 2022-02-24 16:45:56 +08:00