 wangzemei
|
062e796b01
|
* show echarts autoPlay
|
2022-10-19 15:27:14 +08:00 |
|
|
wangzemei
|
700f08b5d5
|
* show echarts autoPlay
|
2022-10-19 15:24:40 +08:00 |
|
|
wangzemei
|
268feebd44
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72350
|
2022-10-19 11:10:09 +08:00 |
|
|
wangzemei
|
5b1f27fb47
|
* stash modify
|
2022-10-19 10:15:58 +08:00 |
|
|
wangyidong
|
07699b5ea4
|
Merge branch 'tanghucheng_feedback_module'
|
2022-10-19 09:36:42 +08: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 |
|
|
tianshujie
|
5af1516780
|
* Finish task #72350.
|
2022-10-19 09:28:35 +08:00 |
|
|
李玉春
|
ada905ca46
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fix bug #28573.
See merge request easycorp/zentaopms!5787
|
2022-10-19 01:14:12 +00:00 |
|
|
wangyidong
|
7f0199715c
|
Merge branch 'sprint/zentaobiz14_feedback_lanzongjun'
|
2022-10-19 08:30:14 +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 |
|
|
王怡栋
|
dfe8483aea
|
Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28624.
See merge request easycorp/zentaopms!5786
|
2022-10-19 00:26:33 +00:00 |
|
|
tianshujie
|
80ee6fb2b1
|
* Fix bug #28573.
|
2022-10-19 08:25:02 +08:00 |
|
|
tanghucheng
|
9ea2d135b3
|
* Fix bug #28624.
|
2022-10-18 17:29:34 +08:00 |
|
|
lanzongjun
|
7469bebf0a
|
task #72131
|
2022-10-18 16:53:10 +08:00 |
|
|
wangzemei
|
e4126b0778
|
* rename classname
|
2022-10-18 16:36:25 +08:00 |
|
|
wangzemei
|
bf166ccbfb
|
* remove unused file
|
2022-10-18 16:34:30 +08:00 |
|
|
wangzemei
|
11a5a5fbf3
|
* task 72350
|
2022-10-18 16:32:06 +08:00 |
|
|
孙广明
|
412c1a68fe
|
Merge branch 'zentaobiz_zhouxin_ticket' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!5784
|
2022-10-18 07:56:51 +00:00 |
|
|
王怡栋
|
9264c95e92
|
Merge branch 'master_feedback_1133' into 'master'
*Finish feedback #1133.
See merge request easycorp/zentaopms!5780
|
2022-10-18 07:37:04 +00:00 |
|
|
王怡栋
|
609b495662
|
Merge branch 'tanghucheng_feedback_module' into 'master'
* Finish task #72201,72130,72129.
See merge request easycorp/zentaopms!5783
|
2022-10-18 07:35:05 +00:00 |
|
|
zhouxin
|
efbbc8a15e
|
* Fix bug.
|
2022-10-18 15:34:05 +08:00 |
|
|
tanghucheng
|
6c063505d6
|
Merge branch 'master' into tanghucheng_feedback_module
|
2022-10-18 15:33:45 +08:00 |
|
|
tanghucheng
|
6ed33f54dc
|
* Adjust modify comments.
|
2022-10-18 15:31:42 +08:00 |
|
|
李玉春
|
15dd3816e2
|
Merge branch 'master_72367' into 'master'
* task #72367, fix modal style.
See merge request easycorp/zentaopms!5778
|
2022-10-18 07:11:47 +00:00 |
|
|
tanghucheng
|
ccd017af47
|
* Finish task #72201,72130,72129.
|
2022-10-18 15:04:35 +08:00 |
|
|
liuhong
|
d7bb46cda5
|
*Finish feedback #1133.
|
2022-10-18 05:46:27 +00:00 |
|
|
李玉春
|
a3104fec30
|
Merge branch 'sprint/247_wzm_72349' into 'master'
Sprint/247 wzm 72349
See merge request easycorp/zentaopms!5774
|
2022-10-18 05:11:01 +00:00 |
|
|
wangzemei
|
9eb84fcc4e
|
* modify format
|
2022-10-18 13:06:15 +08:00 |
|
|
孙广明
|
df46b27efa
|
Merge branch 'sprint/scx_modifyapi' into 'master'
* Taskrecordestimate get function return empty stdclass if task have not estimate.
See merge request easycorp/zentaopms!5775
|
2022-10-18 03:17:51 +00:00 |
|
|
dingyongliang
|
7b24f667aa
|
* task #72367, fix modal style.
|
2022-10-18 02:53:44 +00:00 |
|
|
王怡栋
|
2ca0f0cf0c
|
Merge branch 'sprint/247' into 'master'
Sprint/247
See merge request easycorp/zentaopms!5757
|
2022-10-18 02:01:53 +00:00 |
|
|
王怡栋
|
c46e0d5c7b
|
Merge branch 'sprint/cdq_codereview' into 'master'
* code review
See merge request easycorp/zentaopms!5773
|
2022-10-18 01:58:03 +00:00 |
|
|
宋辰轩
|
22e9cba0df
|
* Taskrecordestimate get function return empty stdclass if task have not estimate.
|
2022-10-18 09:57:51 +08:00 |
|
|
王怡栋
|
a69b141a84
|
Merge branch 'sprint/zentaobiz12_ticket' into 'master'
ticket
See merge request easycorp/zentaopms!5772
|
2022-10-18 01:48:02 +00:00 |
|
|
wangzemei
|
0b2907217f
|
* replace input component
|
2022-10-18 09:43:23 +08:00 |
|
|
chaideqing
|
e50dbc5be3
|
* code review
|
2022-10-18 09:39:39 +08:00 |
|
|
lanzongjun
|
3d2667f818
|
remove line
|
2022-10-18 09:32:16 +08:00 |
|
|
lanzongjun
|
aa6546a2ee
|
resolve conflict
|
2022-10-18 09:26:14 +08:00 |
|
|
wangzemei
|
7075426106
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72349
|
2022-10-18 08:56:26 +08:00 |
|
|
周鑫
|
544b1418fe
|
Merge branch 'zentaobiz_ticket_zhouxin' into 'sprint/zentaobiz12_ticket'
* Fix bugs.
See merge request easycorp/zentaopms!5771
|
2022-10-17 15:06:13 +00:00 |
|
|
zhouxin
|
9593f24d92
|
* Fix bugs.
|
2022-10-17 23:05:00 +08:00 |
|
|
李玉春
|
bb90adf795
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug
See merge request easycorp/zentaopms!5759
|
2022-10-17 09:24:39 +00:00 |
|
|
李玉春
|
90b695432b
|
Merge branch 'sprint/247_tianshujie_72323' into 'master'
* Finish task #72323.
See merge request easycorp/zentaopms!5767
|
2022-10-17 09:23:58 +00:00 |
|
|
李玉春
|
8e2a48e581
|
Merge branch 'sprint/247_tianshujie_tableorder' into 'master'
Sprint/247 tianshujie tableorder
See merge request easycorp/zentaopms!5769
|
2022-10-17 09:23:47 +00:00 |
|
|
tianshujie
|
bc72a89801
|
* Finish task #72374.
|
2022-10-17 16:59:43 +08:00 |
|
|
tianshujie
|
e05f1e7f89
|
* Finish task #72374.
|
2022-10-17 16:58:30 +08:00 |
|
|
tianshujie
|
016125ea7c
|
* Finish task #72324.
|
2022-10-17 16:55:39 +08:00 |
|
|
tanghucheng
|
e32b0bf2ff
|
* Code for feedback module.
|
2022-10-17 16:55:25 +08:00 |
|