 王怡栋
|
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 |
|
|
tanghucheng
|
484cffa1a1
|
* Add ticket module.
|
2022-10-19 09:33:26 +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 |
|
|
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 |
|
|
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 |
|
|
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
|
99e4534f38
|
Merge branch 'master' into master_xieqiyu_draftStory
|
2022-08-22 17:29:21 +08:00 |
|
|
sunguangming
|
9d52e47151
|
Merge branch 'sprint/228_tianshujie_64967'
|
2022-08-22 10:24:40 +08:00 |
|
|
王怡栋
|
e8654f20a9
|
Merge branch 'master' into 'sprint/zentaomax42'
# Conflicts:
# db/update17.5.sql
|
2022-08-19 02:34:50 +00:00 |
|
|
tianshujie
|
98694da2ae
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967
|
2022-08-18 16:47:14 +08:00 |
|
|
sunguangming
|
88ae33eaef
|
* Code for import task bug and add sql.
|
2022-08-18 15:21:40 +08:00 |
|
|
tianshujie
|
399f6b53d9
|
* Finish task #64967.
|
2022-08-18 15:08:07 +08:00 |
|
|
tianshujie
|
9f468e6d24
|
* Finish task #64976.
|
2022-08-18 14:35:19 +08:00 |
|
|
王怡栋
|
bff1d42c2f
|
Merge branch 'sprint/zentaomax42_lanzongjun' into 'sprint/zentaomax42'
* finish task #64943
See merge request easycorp/zentaopms!4997
|
2022-08-18 01:57:13 +00:00 |
|
|
lanzongjun
|
c28e0748dd
|
* finish task #64943
|
2022-08-17 16:39:55 +08:00 |
|
|
王怡栋
|
fe898f9e20
|
Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687
See merge request easycorp/zentaopms!4985
|
2022-08-17 07:33:25 +00:00 |
|
|
wangyidong
|
97700ca723
|
* fix for MYISAM to InnoDB.
|
2022-08-16 08:27:17 +08:00 |
|
|
hufangzhou
|
f98716d88f
|
* Add the xuan update sql to zentao.sql.
|
2022-08-15 10:53:56 +08:00 |
|
|
tianshujie
|
4f08c31607
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687
|
2022-08-15 10:48:36 +08:00 |
|
|
zhujinyong
|
9ebd84ddcb
|
+ Add bi sql.
|
2022-08-15 10:09:32 +08:00 |
|
|
xieqiyu
|
17773dee90
|
* Code for story of add draft status.
|
2022-08-12 16:00:00 +08:00 |
|
|
tianshujie
|
1838710b42
|
* Finish task #63696,63695,63687.
|
2022-08-10 09:02:49 +08:00 |
|