Commit Graph
1595 Commits
Author SHA1 Message Date
liumengyi 9051379f01 * Fix bug #28580. 2022-11-22 13:45:19 +08:00
hufangzhou 16df34b4ae * Adjust the standard sql. 2022-11-21 00:40:29 +00:00
王怡栋 8aeb743c8f Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd

See merge request easycorp/zentaopms!6255
2022-11-18 06:42:59 +00:00
王怡栋 db540eb67a * code for task #76438. 2022-11-18 10:53:30 +08:00
王怡栋 787128c30e Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!6235
2022-11-18 02:10:53 +00:00
caoyanyi 7d80105cff * Code for bug #29355. 2022-11-17 16:00:46 +08:00
hufangzhou a344340f1c * Remove the unwanted xuan sql. 2022-11-17 06:11:54 +00:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
王怡栋 e97e7ab9b5 * code for task #76034,76033. 2022-11-14 14:34:07 +08:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00
daitingting 6868b09d1a * Fix bug. 2022-11-10 02:20:59 +00:00
daitingting 8125b5bf8b * Finish task #75240. 2022-11-09 06:13:07 +00:00
wangyidong d7eee8faf8 * rename update18.0.sql to update17.8.sql. 2022-11-08 09:24:25 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 43ca7832f9 * Fix bug #29355. 2022-11-07 13:16:57 +08:00
wangyidong 0174edafa2 * code for task #74861. 2022-11-04 09:06:33 +08:00
孙广明 82b5a43150 Merge branch 'sprint/254_tianshujie_kanban' into 'master'
* Refactor.

See merge request easycorp/zentaopms!5998
2022-11-03 00:37:46 +00:00
tianshujie af0be6c87a * Merge. 2022-11-02 16:28:26 +08:00
tianshujie 27d340e1db * Refactor. 2022-11-02 15:55:42 +08:00
孙广明 acf5a57b8f Merge branch 'sprint/254_tianshujie_kanban' into 'master'
Sprint/254 tianshujie kanban

See merge request easycorp/zentaopms!5991
2022-11-02 07:53:05 +00:00
tianshujie f7a1df8da4 * Change the minimum range of kanban columns. 2022-11-02 15:34:02 +08:00
hufangzhou d09093f42b * Add the new version. 2022-11-02 06:24:20 +00:00
wangyidong 4a0a5649a0 * adjust code. 2022-11-02 09:16:51 +08:00
wangyidong 97dcdfb72b * fix bug #29130. 2022-11-01 15:40:06 +08:00
zhouxin 8159742756 * Fix bug. 2022-11-01 15:04:29 +08:00
wangyidong 7dee092c08 * code for task #74177. 2022-10-31 13:08:57 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
Yagami c232ec7c7d * Code for task #73233. 2022-10-24 15:43:36 +08:00
王怡栋 81706bf839 Merge branch 'sprint/zentaobiz14_feedback_lanzongjun' into 'master'
* fix bug

See merge request easycorp/zentaopms!5836
2022-10-20 07:50:14 +00:00
lanzongjun 5583916635 * fix bug 2022-10-20 15:46:59 +08:00
hufangzhou e8879c8ad7 * Fix bug #28718. 2022-10-20 05:33:25 +00:00
hufangzhou ee0a444bde * Adjust the type of fields. 2022-10-19 06:48:45 +00:00
hufangzhou d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
王怡栋 e093a27d20 Merge branch 'master' into 'tanghucheng_feedback_module'
# Conflicts:
#   db/update17.6.2.sql
2022-10-19 01:36:16 +00:00
tanghucheng 484cffa1a1 * Add ticket module. 2022-10-19 09:33:26 +08:00
王怡栋 6e9fd55261 Merge branch 'master' into 'sprint/zentaobiz14_feedback_lanzongjun'
# Conflicts:
#   db/update17.6.2.sql
2022-10-19 00:29:18 +00:00
lanzongjun c452bd3595 task #72131 2022-10-19 08:27:20 +08:00
lanzongjun 7469bebf0a task #72131 2022-10-18 16:53:10 +08:00
tanghucheng 6c063505d6 Merge branch 'master' into tanghucheng_feedback_module 2022-10-18 15:33:45 +08:00
tanghucheng ccd017af47 * Finish task #72201,72130,72129. 2022-10-18 15:04:35 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
wangyuting2 f348f1d29d * Add report db. 2022-10-17 07:19:00 +00:00
周鑫 575bee545a Merge branch 'ticket_zhouxin_71832' into 'sprint/zentaobiz12_ticket'
* Add sql for ticket.

See merge request easycorp/zentaopms!5746
2022-10-13 06:49:19 +00:00
lanzongjun 477db5f7f2 add table 2022-10-13 14:19:34 +08:00
zhouxin 3f33a5810c * Add sql for ticket. 2022-10-13 12:12:38 +08:00
wangyidong 91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
lanzongjun f9f49755c1 add sql 2022-10-08 17:04:23 +08:00
lanzongjun 4f79024d88 add sql 2022-10-08 16:47:33 +08:00
lanzongjun 7845fd0aca add sql 2022-10-08 16:35:58 +08:00