孙广明 25f71e0a51 Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify' ...

# Conflicts:
#   module/task/model.php

2022-02-25 00:41:58 +00:00

..

css

* Finish task #41764.

2021-08-30 13:00:53 +08:00

js

* use actual idvalue name for todo create/edit, bug #19011.

2022-02-23 08:27:02 +08:00

lang

* Fix bug #18305.

2022-02-08 09:43:38 +08:00

view

Merge branch 'sprint/185_fixbug_wangyidong' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_fixbug_wangyidong

2022-02-23 17:01:24 +08:00

config.php

* merge from 15.0.beta3.

2021-06-05 13:01:53 +08:00

control.php

* Change maxVersion bizVersion proVersion to edition.

2022-02-24 16:44:11 +08:00

model.php

Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify'

2022-02-25 00:41:58 +00:00