Commit Graph
41755 Commits
Author SHA1 Message Date
tianshujie a2fbd1f47e * Fix bug #24961. 2022-07-08 08:56:55 +08:00
tianshujie b4a9f36ad9 * Fix bug #24972. 2022-07-08 08:50:07 +08:00
tianshujie d976a4caa8 * Fix bug #24697. 2022-07-08 08:28:36 +08:00
tianshujie be1ca95624 * Fix bug #24977. 2022-07-08 08:15:42 +08:00
刘刚 6d59cccaec Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24865.

See merge request easycorp/zentaopms!4419
2022-07-08 00:01:15 +00:00
liuruogu 63fe5c2750 * Fix bug #24865. 2022-07-07 09:23:56 +00:00
王怡栋 938358b7e7 Merge branch 'sprint/211_liumengyi_24920' into 'master'
* Fix bug #24920.

See merge request easycorp/zentaopms!4417
2022-07-07 08:59:51 +00:00
liumengyi bb9ce6dd49 * Fix bug #24920. 2022-07-07 16:58:27 +08:00
王怡栋 9ef8354d1d Merge branch 'sprint/211_tianshujie_fixbug' into 'master'
* Fix bug #24946.

See merge request easycorp/zentaopms!4416
2022-07-07 08:51:25 +00:00
王怡栋 0465854678 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix task #60100

See merge request easycorp/zentaopms!4415
2022-07-07 08:47:03 +00:00
lanzongjun 31109d6519 * fix task #60100 2022-07-07 16:36:24 +08:00
tianshujie 105304ce57 * Fix bug #24946. 2022-07-07 16:18:22 +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
孙广明 57fc7c642e Merge branch 'sprint/211_liumengyi_59480' into 'master'
* Finish task #59480, #59481.

See merge request easycorp/zentaopms!4411
2022-07-07 08:07:09 +00:00
lanzongjun f51027b090 * fix bug #24280 2022-07-07 16:06:48 +08:00
liumengyi 696183b811 * Fix bug of task #59480. 2022-07-07 16:01:26 +08:00
liumengyi ef6ffd019b * Fix bug of task #59480, #59481. 2022-07-07 15:46:36 +08:00
lanzongjun 6555c7a30a * fix bug #24937 2022-07-07 15:40:38 +08:00
liumengyi d24c7185f5 * Fix bug of task #59480, #59481. 2022-07-07 15:35:19 +08:00
liumengyi ecdd330102 * Fix bug of task #59480,#59481. 2022-07-07 14:41:10 +08:00
liumengyi e709c4bbda * Finish task #59480, #59481. 2022-07-07 14:12:45 +08:00
孙广明 b2dac0d660 Merge branch 'liyuchun_59430' 2022-07-07 14:01:18 +08:00
李玉春 ce18e2e476 Merge branch 'master' into 'liyuchun_59430'
# Conflicts:
#   module/repo/control.php
2022-07-07 05:59:30 +00:00
李玉春 c392efc4e4 Merge branch 'cyy_59430' into 'master'
* Finish task #59430.

See merge request easycorp/zentaopms!4404
2022-07-07 05:57:05 +00:00
liyuchun 7784dfa80d * Finish task #59434. 2022-07-07 05:56:33 +00:00
李玉春 e06426f77f Merge branch 'cyy_bug' into 'master'
* Modify back btn.

See merge request easycorp/zentaopms!4397
2022-07-07 05:54:54 +00:00
liyuchun 92988c9386 * Finish task #59432,59434. 2022-07-07 05:53:56 +00:00
王怡栋 7c432a46b0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #24937

See merge request easycorp/zentaopms!4407
2022-07-07 05:36:54 +00:00
刘刚 7262a6d365 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24912.

See merge request easycorp/zentaopms!4406
2022-07-07 05:32:53 +00:00
lanzongjun ec9c9f2a0e * fix bug #24937 2022-07-07 13:32:34 +08:00
daitingting 008043aa25 * Fix bug #24912. 2022-07-07 05:31:24 +00:00
caoyanyi 28c4deffb7 * Modify data get. 2022-07-07 13:20:22 +08:00
wangyidong 6d71c5e346 * fix bug #24794. 2022-07-07 13:18:25 +08:00
王怡栋 5dd799ee9e Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug  #24942, #24949.

See merge request easycorp/zentaopms!4400
2022-07-07 05:10:46 +00:00
王怡栋 10b95d1e48 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4398
2022-07-07 05:10:07 +00:00
liumengyi 9e5a0ff356 * Fix bug for task #59469. 2022-07-07 12:06:41 +08:00
xieqiyu ef190dc83e * Code for task#59543. Update create bug and batch create bug. 2022-07-07 11:42:54 +08:00
刘刚 c958da7bf4 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24924.

See merge request easycorp/zentaopms!4405
2022-07-07 03:20:08 +00:00
daitingting 162513b943 * Fix bug #24924. 2022-07-07 03:18:45 +00:00
caoyanyi 40d2eca43b * Finish task #59430. 2022-07-07 11:17:41 +08:00
刘刚 263419df29 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24959.

See merge request easycorp/zentaopms!4403
2022-07-07 03:13:21 +00:00
liuruogu 15d87d68e4 * Fix bug #24959. 2022-07-07 03:12:51 +00:00
liuruogu bf62f6fa75 * Fix bug #24959. 2022-07-07 03:03:59 +00:00
孙广明 d02553620f Merge branch 'srpint213_zg_24853' into 'master'
* Fix bug#24853

See merge request easycorp/zentaopms!4396
2022-07-07 02:54:25 +00:00
孙广明 27959db980 Merge branch 'sprint/213_mayue_bug#24811' into 'master'
* Fix bug #24811.

See merge request easycorp/zentaopms!4402
2022-07-07 02:54:16 +00:00
mayue 8192f8b185 * Fix bug #24811. 2022-07-07 10:52:45 +08:00
孙广明 c540e7002d Merge branch 'sprint/211_tianshujie_58555' into 'master'
Sprint/211 tianshujie 58555

See merge request easycorp/zentaopms!4392
2022-07-07 02:51:51 +00:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
刘刚 ff94cac738 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24898.

See merge request easycorp/zentaopms!4399
2022-07-07 02:36:20 +00:00
daitingting cfc20958d0 * Fix bug #24903. 2022-07-07 02:35:55 +00:00