Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,955 Commits 2 Branches 292 Tags
d023bcb50672a4be322262bbf75c19f4e49b3844
Commit Graph
795 Commits
Author SHA1 Message Date
zenggang ee78bb255b * Resolve feedback#1692 2022-12-12 02:53:26 +00:00
孙广明 8fa7675188 Merge branch 'master' into 'master_xieqiyu_78690' 
# Conflicts:
#   module/productplan/model.php
 2022-12-09 08:58:14 +00:00
xieqiyu 7405efe5c7 * Code for task#78690. 2022-12-09 15:39:55 +08:00
lanzongjun 980b2998ad * Fix Bug #78688 2022-12-09 13:58:10 +08:00
lanzongjun d6f9976aae * Finish Bug #30480 2022-12-08 11:06:04 +08:00
lanzongjun 5f3444278b * Finish Task #78688 2022-12-07 14:22:27 +08:00
Yagami ac2a798661 * Finish task #78689. 2022-12-05 14:16:02 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
liuyongkai 80bd2c745c * Resolve feedback #1461. 2022-12-01 14:25:21 +08:00
lanzongjun 315dc16980 master branch only relation master plan 2022-12-01 14:04:26 +08:00
lanzongjun 2a75393953 * Finish Task #77806 2022-11-30 15:57:08 +08:00
lanzongjun 00877a531d code meeting fix 2022-11-30 09:05:23 +08:00
lanzongjun 9077e9b4a3 * Fix Task #77798 2022-11-29 14:35:07 +08:00
zenggang 9b63267e10 * Fix bug#30309 2022-11-29 03:01:45 +00:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00:00
王怡栋 eb84b76b2c * fix bug. 2022-11-25 08:35:00 +08:00
王怡栋 994015ade9 * fix bug #30229. 2022-11-25 08:34:59 +08:00
lanzongjun 284b748e7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-11-22 15:45:19 +08:00
lanzongjun a3f8f5f437 * Fix Task #77278 2022-11-22 14:23:01 +08:00
xieqiyu 46879558bb * Fix bug#30027. 2022-11-22 09:52:08 +08:00
wangyuting 5df0b941b1 * Fix bug #29959. 2022-11-18 02:51:50 +00:00
wangyuting 532bef39f3 * Finish task #76434. 2022-11-17 08:03:03 +00:00
王怡栋 66be15c00f * fix bug #29736. 2022-11-15 11:13:04 +08:00
lanzongjun 0bf1aa8473 * finish bug #29448 2022-11-11 14:01:12 +08:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00
孙广明 f0037b4036 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
* finish task #75330

See merge request easycorp/zentaopms!6080
 2022-11-09 07:39:44 +00:00
xieqiyu af5b858388 * Finish task#75379,#75324. 2022-11-09 02:26:35 +00:00
xieqiyu f67c4801cb * Finish task#75379,#75324. 2022-11-09 02:03:57 +00:00
lanzongjun 33551e41c1 * finish task #75330 2022-11-08 17:48:26 +08:00
lanzongjun 70fd479801 * finish task #75327 2022-11-08 13:58:34 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
lanzongjun f980579b0a * task #74142 2022-11-02 14:42:20 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
lanzongjun 67737d25c2 * task #74142 2022-11-01 09:58:04 +08:00
Yagami 0e3de2163b * Fix referer bug. 2022-10-28 09:17:19 +08:00
王怡栋 c1db41db21 Merge branch 'zentaopms_239_task#28924' into 'zentaopms_239' 
* Fix bug #28924.

See merge request easycorp/zentaopms!5902
 2022-10-27 05:46:29 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyuting2 a4e210b425 * Finish task #28924. 2022-10-27 00:58:32 +00:00
wangyidong 585b12838e * code for task #73472. 2022-10-25 14:04:12 +08:00
王怡栋 aa49a5bbd3 Merge branch 'zentaopms_239_task_#72984' into 'zentaopms_239' 
* Finish task #72984.

See merge request easycorp/zentaopms!5883
 2022-10-25 05:08:33 +00:00
daitingting 1aa860c972 * Finish task #72984. 2022-10-25 03:24:04 +00:00
daitingting 9825419bd4 * Finish task #73066. 2022-10-25 02:06:30 +00:00
wangyuting2 541ea48b72 * Finish task #72986. 2022-10-24 06:14:53 +00:00
lanzongjun da3f54870d fix bug guide 2022-10-21 16:13:38 +08:00
wangyuting2 decff18c2a * Finish task #71570. 2022-10-20 06:11:00 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liugang 48703a3f26 * Fix bug #28271. 2022-10-09 16:53:11 +08:00
曹延义 9e7e1f6969 * Finish task #71906. 2022-10-08 17:17:42 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00