Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
45,863 Commits 2 Branches 292 Tags
239fbae00a03e93ae853e446b986becf5acaa13b
Commit Graph
905 Commits
Author SHA1 Message Date
hufangzhou d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
tanghucheng ccd017af47 * Finish task #72201,72130,72129. 2022-10-18 15:04:35 +08:00
tanghucheng 36a8194f4c * Remove merge feedback module for tree and upgrade. 2022-10-17 09:05:08 +08:00
wangyidong 91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
hufangzhou 952f0395c9 * Add the new version 2022-09-23 16:33:40 +08:00
tianshujie 73f3a6d80a * Finish task #68925. 2022-09-13 16:53:52 +08:00
wangyidong 2a8eacad9c * Fix weekly report. 2022-09-08 17:30:50 +08:00
王怡栋 457063cc44 Merge branch 'sprint/hufangzhou_fixxuanxuan' into 'master' 
* Fix error for xuan.

See merge request easycorp/zentaopms!5292
 2022-09-08 08:12:42 +00:00
hufangzhou 8fef2d9166 * Remove the unsed code. 2022-09-08 16:12:27 +08:00
wangyidong fdc9b93d82 * adjust for upgrade and holiday. 2022-09-08 16:08:03 +08:00
hufangzhou e828862deb * Fix error for xuan. 2022-09-08 16:04:41 +08:00
hufangzhou 55ce88445b * Add the new version. 2022-09-08 15:17:06 +08:00
lanzongjun e0bb42fac5 resolve conflict 2022-09-08 11:18:09 +08:00
王怡栋 84da5dced1 Merge branch 'master' into 'master_xieqiyu_67691' 
# Conflicts:
#   db/update17.6.sql
 2022-09-08 01:38:22 +00:00
wangyidong 548c24ba42 * fix bug. 2022-09-07 17:11:12 +08:00
xieqiyu 62b51f7c9e * Code for task#66954,66959. 2022-09-07 14:20:33 +08:00
wangyidong 2a7d73ef55 * fix for upgrade for effort order. 2022-09-07 10:06:23 +08:00
lanzongjun bb17fc804e * sync product 2022-09-06 15:46:23 +08:00
lanzongjun 45f0cea0f7 * sync product 2022-09-06 15:12:47 +08:00
王怡栋 19d5097ff3 Merge branch 'sprint/daitingting_optimize' into 'master' 
* Optimize codes.

See merge request easycorp/zentaopms!5269
 2022-09-06 05:44:51 +00:00
daitingting dc0ecc890e * Optimize codes. 2022-09-06 05:26:47 +00:00
王怡栋 0e1038275f Merge branch 'sprint/235_liumengyi_27238' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!5259
 2022-09-05 05:09:06 +00:00
lanzongjun f7922c8c70 * fix bug #27198 2022-09-05 11:03:26 +08:00
liumengyi 264fb13c2e * Fix bug. 2022-09-02 17:16:59 +08:00
liumengyi 609a2e3b46 * Fix bug. 2022-09-02 17:11:37 +08:00
王怡栋 158bd704f8 Merge branch 'sprint/235_liumengyi_27238' into 'master' 
* Fix bug #27135,#27034.

See merge request easycorp/zentaopms!5255
 2022-09-02 09:08:48 +00:00
liumengyi 623aa4ef63 * Fix bug. 2022-09-02 17:07:52 +08:00
liumengyi 823a9af768 * Fix bug. 2022-09-02 17:03:56 +08:00
sunguangming dbcc64cc4c * Add order to effort. 2022-09-02 14:05:14 +08:00
sunguangming d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08:00
lanzongjun 5ad5882e9b resolve conflict 2022-09-02 13:20:42 +08:00
wangyidong 1d326d5bb9 * code for task #67405. 2022-09-02 09:09:47 +08:00
sunguangming 812cfb68e2 * Convert task team. 2022-09-01 17:17:10 +08:00
lanzongjun b3d71e552a add upgrade feedback 2022-09-01 17:04:27 +08:00
xieqiyu 2bbb4df770 * Code for task#66954. 2022-08-31 20:29:26 +08:00
xieqiyu 0cd8ce30cd * Finish task#66954,#66960,#66959,#66958,#66956. 2022-08-31 12:35:45 +08:00
wangyidong 13361f4b5a * fix bug #26866. 2022-08-26 09:15:55 +08:00
hufangzhou e55c40278d * Add the new version. 2022-08-25 09:31:18 +08:00
tanghucheng bbd1c4ea5e * Fix bug #26617. 2022-08-24 17:05:46 +08:00
xieqiyu 840e0dd810 * Delete unused code. 2022-08-24 10:10:04 +08:00
xieqiyu 1db00037b4 * * Modify update sql of change story status. 2022-08-24 10:05:49 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
xieqiyu a1212a5a8b * * Add upgrade sql and the function of updateStoryStatus. 2022-08-22 16:43:36 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
tianshujie 060a2d9df0 * Finish task #64967. 2022-08-22 10:01:53 +08:00
liumengyi ee19dd6d4a * Fix bug for task #64967. 2022-08-22 09:22:39 +08:00
tianshujie 0b1327902b * Finish task #63696. 2022-08-19 14:45:10 +08:00
liumengyi ea5d22cc05 * Finish task #64967 for upgrade. 2022-08-18 16:49:22 +08:00
tianshujie 8287baa6dc * Finish task #63696. 2022-08-18 10:45:58 +08:00
tianshujie 46071ffaec * Finish task #63696. 2022-08-18 10:42:06 +08:00