Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-21 2aeb8d16fc4e83d62800967cff240a5eafb0a718

Merge branch 'local_20221014' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/AutomessageSysUserDao.java

@@ -23,7 +23,7 @@
     * @param id
     * @return
     */
    @Select("select * from automessage_sys_user where id = #{id}")
    @Select("select * from automessage_sys_user where user_id = #{id}")
    AutomessageSysUser selectAutomessageSysUserById(@Param("id") Long id);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/AutomessageSysUserServiceImpl.java

@@ -7,6 +7,8 @@
import com.panzhihua.service_community.service.AutomessageSysUserService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * @ClassName: AutomessageSysUserServiceImpl
 * @Author: yh
@@ -16,8 +18,10 @@
@Service
public class AutomessageSysUserServiceImpl extends ServiceImpl<AutomessageSysUserDao, AutomessageSysUser>
        implements AutomessageSysUserService {
    @Resource
    private AutomessageSysUserDao automessageSysUserDao;
    @Override
    public R selectAutomessageSysUserById(Long id) {
        return R.ok(super.getById(id));
        return R.ok(automessageSysUserDao.selectAutomessageSysUserById(id));
    }
}