Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
lbw 2022-12-24 16:06:36 +08:00
commit e7324a10ae
2 changed files with 2 additions and 1 deletions

View File

@ -71,7 +71,7 @@ public class GenDsConfController {
* @return R
*/
@GetMapping("/{id}")
public R<GenDatasourceConf> getById(@PathVariable("id") Integer id) {
public R<GenDatasourceConf> getById(@PathVariable("id") Long id) {
return R.ok(datasourceConfService.getById(id));
}

View File

@ -58,6 +58,7 @@
init (id) {
this.visible = true;
this.canSubmit = true;
this.dataForm.${pk.lowerAttrName} = undefined
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (id) {