 王怡栋
|
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 |
|
|
周鑫
|
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 |
|
|
lanzongjun
|
949d430fd4
|
add sql
|
2022-10-08 09:30:19 +08:00 |
|
|
lanzongjun
|
2a7b35764f
|
* modify db
|
2022-09-30 10:16:57 +08:00 |
|
|
lanzongjun
|
398bc004e2
|
modify sql
|
2022-09-29 14:00:32 +08:00 |
|
|
曹延义
|
2f7ed68fa2
|
* Add kanban setting check.
|
2022-09-29 09:43:43 +08:00 |
|
|
lanzongjun
|
f7b1163f39
|
modify db
|
2022-09-28 15:32:34 +08:00 |
|
|
wangzemei
|
bcd3d36418
|
* modify backend logic
|
2022-09-27 17:10:18 +08:00 |
|
|
lanzongjun
|
1264f361ee
|
* add database
|
2022-09-26 16:50:38 +08:00 |
|
|
lanzongjun
|
ba9c9552b0
|
* add database
|
2022-09-26 13:56:57 +08:00 |
|
|
tianshujie
|
3a9b2c4952
|
* Modify the SQL.
|
2022-09-26 08:12:53 +08:00 |
|
|
朱金勇
|
d3911c77e6
|
Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug
See merge request easycorp/zentaopms!5518
|
2022-09-23 16:05:19 +00:00 |
|
|
hufangzhou
|
952f0395c9
|
* Add the new version
|
2022-09-23 16:33:40 +08:00 |
|
|
tianshujie
|
c689dd0f0a
|
* Fix bug #27688.
|
2022-09-23 13:50:36 +08:00 |
|
|
tianshujie
|
63fc7c0595
|
* Fix bug #27688.
|
2022-09-22 14:54:07 +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 |
|
|
zenggang
|
6e88d85003
|
* Add sql
|
2022-09-08 02:29:15 +00:00 |
|
|
王怡栋
|
84da5dced1
|
Merge branch 'master' into 'master_xieqiyu_67691'
# Conflicts:
# db/update17.6.sql
|
2022-09-08 01:38:22 +00:00 |
|
|
zenggang
|
7c2244c088
|
* Code for task#67792
|
2022-09-08 00:46:20 +00:00 |
|
|
wangyidong
|
4092d95876
|
* code for task #68204.
|
2022-09-07 15:01:27 +08:00 |
|
|
xieqiyu
|
62b51f7c9e
|
* Code for task#66954,66959.
|
2022-09-07 14:20:33 +08:00 |
|
|
wangyidong
|
1d326d5bb9
|
* code for task #67405.
|
2022-09-02 09:09:47 +08:00 |
|
|
wangyidong
|
e7d65e1dce
|
Merge branch 'sprint/zentaopms230'
|
2022-09-01 13:28:26 +08:00 |
|
|
hufangzhou
|
e55c40278d
|
* Add the new version.
|
2022-08-25 09:31:18 +08:00 |
|
|
liyuchun
|
a9b8582cc9
|
* Add cron task.
|
2022-08-25 08:57:01 +08:00 |
|
|
liyuchun
|
b2189bf529
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-25 08:55:31 +08:00 |
|
|
liyuchun
|
0f1d8abfdf
|
* Add filed in zt_job.
|
2022-08-25 08:55:18 +08:00 |
|
|
xieqiyu
|
1db00037b4
|
* * Modify update sql of change story status.
|
2022-08-24 10:05:49 +08:00 |
|
|
xieqiyu
|
bd510fe0d4
|
* Fix bug of update story datetable.
|
2022-08-23 10:11:31 +08:00 |
|
|
xieqiyu
|
64b9c8d35e
|
* Delete unused code.
|
2022-08-22 17:41:29 +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 |
|
|
liyuchun
|
806bc627ed
|
* Remove sql.
|
2022-08-19 16:00:49 +08:00 |
|
|
王怡栋
|
e8654f20a9
|
Merge branch 'master' into 'sprint/zentaomax42'
# Conflicts:
# db/update17.5.sql
|
2022-08-19 02:34:50 +00:00 |
|
|
李玉春
|
6399c58056
|
Merge branch 'sprint/228_tianshujie_64976' into 'master'
Sprint/228 tianshujie 64976
See merge request easycorp/zentaopms!5017
|
2022-08-18 09:57:34 +00:00 |
|