 tianshujie
|
f30883a442
|
* Delete extra blank lines.
|
2022-05-25 17:28:44 +08:00 |
|
|
李玉春
|
b41cdeb6f4
|
Merge branch 'sprint/194_tianshujie_55257' into 'master'
Sprint/194 tianshujie 55257
See merge request easycorp/zentaopms!3594
|
2022-05-25 08:08:26 +00:00 |
|
|
tianshujie
|
8e3068d9b5
|
* Finish task #55257.
|
2022-05-25 14:26:21 +08:00 |
|
|
孙广明
|
2c60c73f47
|
Merge branch 'sprint/195_zg_55147' into 'master'
* Finish task#55174，55172
See merge request easycorp/zentaopms!3573
|
2022-05-25 05:51:37 +00:00 |
|
|
tianshujie
|
e3d1c44eae
|
* Finish task #55257.
|
2022-05-25 13:45:10 +08:00 |
|
|
mayue
|
33b78769b4
|
* Fix bug #22901.
|
2022-05-25 05:28:36 +00:00 |
|
|
daitingting
|
79af02f18a
|
* Remove useless object param.
|
2022-05-25 01:25:53 +00:00 |
|
|
zenggang
|
5b623fa3c4
|
* Finish task#55174
|
2022-05-25 01:12:37 +00:00 |
|
|
daitingting
|
e2f7c10296
|
* Set default value in getFieldControl function, finish task #54954.
|
2022-05-25 01:03:06 +00:00 |
|
|
孙广明
|
495a034784
|
* Finish task #55178.
|
2022-05-24 14:15:34 +08:00 |
|
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
|
孙华伟
|
9e9395694d
|
*Fix bug #22375.
|
2022-05-19 15:27:37 +08:00 |
|
|
liumengyi
|
2d3f07a300
|
* Code format fot task #54318.
|
2022-05-19 10:35:12 +08:00 |
|
|
liumengyi
|
dee4ff7043
|
* Finish task #54318.
|
2022-05-19 08:55:27 +08:00 |
|
|
孙华伟
|
0d132275da
|
Update recordestimate.js
|
2022-05-18 07:59:48 +00:00 |
|
|
孙华伟
|
587bc3c414
|
*Fix bug #22621.
|
2022-05-18 14:48:09 +08:00 |
|
|
wangyidong
|
8aad51ace3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-05-18 10:29:11 +08:00 |
|
|
wangyidong
|
d6cf08b9d7
|
Merge branch 'tid'
|
2022-05-18 10:20:48 +08:00 |
|
|
孙华伟
|
545dcf550c
|
*Optimize the code.
|
2022-05-17 17:28:11 +08:00 |
|
|
孙华伟
|
3099628ce1
|
*Optimize the code.
|
2022-05-17 17:08:27 +08:00 |
|
|
孙华伟
|
9887a64cfb
|
*Fix bug #22375.
|
2022-05-17 16:12:53 +08:00 |
|
|
tanghucheng
|
d3dc4ebe43
|
* Fix bug.
|
2022-05-17 06:00:26 +00:00 |
|
|
孙华伟
|
4bc08301f8
|
*Fix bug #22375
|
2022-05-17 10:40:11 +08:00 |
|
|
wangyidong
|
759ace3700
|
* code for task #54026.
|
2022-05-16 16:36:04 +08:00 |
|
|
孙华伟
|
3ae610d77d
|
Update model.php
|
2022-05-16 08:27:21 +00:00 |
|
|
孙华伟
|
94af8b93af
|
*Optimize the code.
|
2022-05-16 16:26:19 +08:00 |
|
|
孙华伟
|
ecea8c6147
|
Update model.php
|
2022-05-16 08:24:40 +00:00 |
|
|
孙华伟
|
4c968d5872
|
*Optimize the code.
|
2022-05-16 16:21:34 +08:00 |
|
|
孙华伟
|
39c0ad9c17
|
*Finish task #54207.
|
2022-05-16 16:08:30 +08:00 |
|
|
xieqiyu
|
e085535743
|
* Fix bug#22375.
|
2022-05-16 14:59:06 +08:00 |
|
|
wangyidong
|
aa0f666d41
|
* adjust for project flow.
|
2022-05-12 15:52:24 +08:00 |
|
|
wangyuting2
|
3380222afc
|
* Fix build action menu bug.
|
2022-05-11 16:11:34 +08:00 |
|
|
wangyuting2
|
d4ed89e64a
|
* Finish task #53548.
|
2022-05-11 15:05:13 +08:00 |
|
|
daitingting
|
e30acad1f2
|
* Add id for checking unique field.
|
2022-05-09 07:56:17 +00:00 |
|
|
daitingting
|
96e460c47d
|
* Finish task #53549.
|
2022-05-09 06:41:35 +00:00 |
|
|
hufangzhou
|
90265f93d8
|
* Add the new version.
|
2022-05-06 13:48:21 +08:00 |
|
|
王怡栋
|
a0c13f4d80
|
Merge branch 'fixbug' into 'master'
* Fix bug #22025,22028.
See merge request easycorp/zentaopms!3181
|
2022-04-28 08:46:46 +00:00 |
|
|
李玉春
|
e6c646f6bd
|
Merge branch 'sprint/fixbug_liumengyi_2441' into 'master'
* Fix bug #2441.
See merge request easycorp/zentaopms!3198
|
2022-04-28 08:26:06 +00:00 |
|
|
liumengyi
|
2780f01d00
|
* Fix bug #2441.
|
2022-04-28 16:21:37 +08:00 |
|
|
mayue
|
3d55d30a92
|
* Optimize code.
|
2022-04-28 07:54:22 +00:00 |
|
|
mayue
|
94c3a3a270
|
* Fix bug #10878.
|
2022-04-28 07:50:01 +00:00 |
|
|
tanghucheng
|
c04c165276
|
* Fix bug #21429.
|
2022-04-28 13:50:48 +08:00 |
|
|
sunjun
|
c2d9f7b240
|
*Fixbug_sunjun_22007
|
2022-04-28 02:48:11 +00:00 |
|
|
sunjun
|
0495a32a20
|
*Fixbug_sunjun_22007
|
2022-04-27 07:59:37 +00:00 |
|
|
zhouxudong
|
5c09cedfe9
|
* Fix bug #22022.
|
2022-04-27 01:11:34 +00:00 |
|
|
mayue
|
18b70b3208
|
* Fix bug #10878.
|
2022-04-26 09:18:13 +00:00 |
|
|
孙广明
|
8010daa536
|
Merge branch 'sprint/master_zhouxudong_15338' into 'master'
* Fix bug #15338.
See merge request easycorp/zentaopms!3140
|
2022-04-26 09:12:31 +00:00 |
|
|
zhouxudong
|
9851bc1047
|
* Fix bug #15338.
|
2022-04-26 09:10:29 +00:00 |
|
|
zhouxudong
|
a55f5f9df6
|
* Fix bug #15338.
|
2022-04-26 09:03:06 +00:00 |
|
|
李玉春
|
fe221fec43
|
Merge branch 'bug_21982' into 'master'
Fix bug#21982,21983,21981
See merge request easycorp/zentaopms!3122
|
2022-04-26 08:09:06 +00:00 |
|