Commit Graph
42087 Commits
Author SHA1 Message Date
李玉春 b97ccec787 Merge branch 'gitea_module' into 'master'
* Modify upgrade module.

See merge request easycorp/zentaopms!4537
2022-07-14 02:44:53 +00:00
caoyanyi a4652eef9a * Modify upgrade module. 2022-07-14 10:43:51 +08:00
孙广明 3ff0f710b7 Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Fix bug for task #60476.

See merge request easycorp/zentaopms!4532
2022-07-14 02:39:38 +00:00
孙广明 4cdb77e983 Merge branch 'sprint/tianshujie_25205' into 'master'
* Fix bug #25205.

See merge request easycorp/zentaopms!4536
2022-07-14 02:39:28 +00:00
tianshujie da9666247b * Fix bug #25205. 2022-07-14 10:38:19 +08:00
孙广明 f2a76aad04 Merge branch 'sprint216_25241' into 'master'
* Fix bug#25241

See merge request easycorp/zentaopms!4534
2022-07-14 02:35:09 +00:00
孙广明 b73de23549 Merge branch 'sprint/216_mayue_bug#24930' into 'master'
* Fix bug #24930.

See merge request easycorp/zentaopms!4535
2022-07-14 02:34:52 +00:00
mayue b4dff9c119 * Fix bug #24930. 2022-07-14 10:33:56 +08:00
孙广明 bf3136a168 * Fix bug #25238. 2022-07-14 10:32:28 +08:00
tianshujie 9bc172e1b8 * Fix bug #25205. 2022-07-14 10:27:06 +08:00
孙广明 a415cea027 Merge branch 'sprint/216_mayue_bug#25191#25087' into 'master'
* Fix bug #25191#25087.

See merge request easycorp/zentaopms!4533
2022-07-14 02:21:34 +00:00
zenggang fd9b0b1053 * Fix bug#25241 2022-07-14 02:20:00 +00:00
孙广明 cb6e69a9b9 * Fix execution list drop load bug. 2022-07-14 10:16:04 +08:00
mayue 4226041ae4 * Fix bug #25191#25087. 2022-07-14 10:15:57 +08:00
孙广明 52c9717727 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4531
2022-07-14 02:06:13 +00:00
tianshujie 49007c2a17 * Fix bug #25234. 2022-07-14 10:05:15 +08:00
liumengyi 8c2905162f * Fix bug for task #60476. 2022-07-14 10:04:37 +08:00
tianshujie b5a9fe8c52 * Fix bug #25234,25233. 2022-07-14 09:57:56 +08:00
孙广明 6a4d372473 Merge branch 'sprint216_zg_bug' into 'master'
* Fix bug#25222,25232

See merge request easycorp/zentaopms!4527
2022-07-14 01:46:53 +00:00
孙广明 1978dbd4b8 Merge branch 'fixbug_25216' into 'master'
Fixbug 25216

See merge request easycorp/zentaopms!4528
2022-07-14 01:46:40 +00:00
孙广明 fe8f028590 Merge branch 'fixbug_25174' into 'master'
fixbug_25174

See merge request easycorp/zentaopms!4519
2022-07-14 01:45:08 +00:00
孙广明 d41303c7e2 Merge branch 'fixbug_dynamic' into 'master'
fixbug_dynamic

See merge request easycorp/zentaopms!4515
2022-07-14 01:44:53 +00:00
孙广明 1444773e4d Merge branch 'sprint/mastr_zhouxudong_code' into 'master'
* Code optimization.

See merge request easycorp/zentaopms!4522
2022-07-14 01:44:40 +00:00
sunjun a40ae1ee63 fixbug_25216 2022-07-14 01:43:36 +00:00
zenggang 38e996bd18 * Fix bug#25222,25232 2022-07-14 01:38:00 +00:00
王怡栋 842a44f27c Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Fix bug for task #60476, and fix bug #25063, and fix bug #25230.

See merge request easycorp/zentaopms!4525
2022-07-14 01:36:52 +00:00
tianshujie ace5265a11 * Fix bug #25206. 2022-07-14 09:36:42 +08:00
liumengyi 026e28b96b * Fix bug for task #60476. 2022-07-14 09:35:59 +08:00
liumengyi b242d1319f * Fix bug #25230. 2022-07-14 09:28:42 +08:00
sunjun 51fe9cc511 fixbug_25216 2022-07-14 01:22:53 +00:00
孙广明 665901a969 * Fix bug #25226. 2022-07-14 09:09:48 +08:00
王怡栋 7523d2bd35 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* add standard sql

See merge request easycorp/zentaopms!4526
2022-07-14 01:06:37 +00:00
lanzongjun 32eef59eaf * add standard sql 2022-07-14 09:05:46 +08:00
王怡栋 bb9dbe5827 Merge branch 'master_xieqiyu_25198' into 'master'
Master xieqiyu 25198

See merge request easycorp/zentaopms!4523
2022-07-14 00:57:50 +00:00
王怡栋 5a6fabfa5e Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #25172

See merge request easycorp/zentaopms!4521
2022-07-14 00:57:00 +00:00
liumengyi fa1b2ce2b1 * Fix bug #25063. 2022-07-14 08:54:44 +08:00
liumengyi eeb7835412 * Fix bug for task #60476. 2022-07-14 08:48:47 +08:00
sunjun 63ee113190 fixbug_25216 2022-07-14 00:44:15 +00:00
tianshujie 0af55e3659 * Fix bug #25205. 2022-07-14 08:40:53 +08:00
xieqiyu fcb1e2fd93 * Fix bug#25198. 2022-07-14 08:40:53 +08:00
孙广明 383a864001 * Add disabled to unclikable btn. 2022-07-14 08:39:56 +08:00
xieqiyu 2c5ca0fc6a * Fix bug#25198. 2022-07-14 08:39:46 +08:00
tianshujie 1e0aff765a * Fix bug #25208. 2022-07-14 08:17:00 +08:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
lanzongjun eac15cf70a * fix bug #25172 2022-07-13 16:04:15 +08:00
王怡栋 559baff057 Merge branch 'sprint/215_liumengyi_23641' into 'master'
* Fix bug #23641.

See merge request easycorp/zentaopms!4518
2022-07-13 07:23:02 +00:00
王怡栋 677a224d84 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug about kanban actions.

See merge request easycorp/zentaopms!4520
2022-07-13 07:22:35 +00:00
zhouxudong 73dd8c3eeb * Fix bug about kanban actions. 2022-07-13 07:17:04 +00:00
sunjun eb07793262 fixbug_25174 2022-07-13 06:57:48 +00:00
liumengyi 51dd442c01 * Fix bug #23641. 2022-07-13 14:51:38 +08:00