caoliqin

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_java

9 小时之前

caoliqin 推送了 openImAndLive 分支的代码到 root/ylrz_his_scrm_java

  • 1f717b7e70 fix:会员营期看课统计已删除的课程过滤掉

12 小时之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_companyUI

1 天之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_java

1 天之前

caoliqin 推送了 openImAndLive 分支的代码到 root/ylrz_his_scrm_java

  • 2f5f081c64 Merge branch 'openImAndLive' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openImAndLive
  • fc9e54f46d feat:处理合并代码冲突
  • 795290e87d Merge branch 'openImAndLive' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openImAndLive
  • 39a25570e6 Merge branch 'openImAndLive' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openImAndLive
  • 2aaf053387 Merge branch 'refs/heads/master' into openImAndLive # Conflicts: # fs-admin/src/main/java/com/fs/his/task/Task.java # fs-company/src/main/resources/application.yml # fs-doctor-app/src/main/resources/application.yml # fs-service/src/main/java/com/fs/company/mapper/CompanyMapper.java # fs-service/src/main/java/com/fs/company/vo/CompanyUserImportVO.java # fs-service/src/main/java/com/fs/core/utils/OrderCodeUtils.java # fs-service/src/main/java/com/fs/course/domain/FsUserTalent.java # fs-service/src/main/java/com/fs/course/mapper/FsUserTalentMapper.java # fs-service/src/main/java/com/fs/course/service/IFsUserCourseService.java # fs-service/src/main/java/com/fs/course/service/IFsUserTalentService.java # fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseServiceImpl.java # fs-service/src/main/java/com/fs/course/service/impl/FsUserTalentServiceImpl.java # fs-service/src/main/java/com/fs/his/mapper/FsDoctorMapper.java # fs-service/src/main/java/com/fs/his/service/IFsStoreOrderService.java # fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java # fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreCartScrmMapper.java # fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java # fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreAfterSalesScrmServiceImpl.java # fs-service/src/main/resources/application-druid-hcl.yml # fs-service/src/main/resources/application-druid-hdt.yml # fs-service/src/main/resources/application-druid-nmgyt.yml # fs-service/src/main/resources/mapper/course/FsUserTalentMapper.xml # fs-service/src/main/resources/mapper/hisStore/FsStoreProductScrmMapper.xml # fs-user-app/src/main/java/com/fs/app/controller/course/CourseFsUserController.java # fs-user-app/src/main/resources/application.yml
  • 对比 201 次代码提交 »

1 天之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_java

2 天之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_adminUI

2 天之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_companyUI

5 天之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_java

6 天之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_java

1 周之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_companyUI

1 周之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_companyUI

1 周之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_java

1 周之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_adminUI

1 周之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_java

1 周之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_adminUI

  • a8143e2653 feat:项目会员管理-删除-权限点修改

3 周之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_java

3 周之前

caoliqin 推送了 master 分支的代码到 root/ylrz_his_scrm_java

3 周之前

caoliqin 推送了 openIm 分支的代码到 root/ylrz_his_scrm_java

3 周之前

caoliqin 推送了 openIm 分支的代码到 root/ylrz_his_scrm_java

  • 7a14641f30 Merge branch 'openIm' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openIm
  • 6da47b2855 feat:配置修改
  • be6101392f Merge branch 'openIm' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openIm # Conflicts: # fs-service/src/main/resources/application-druid-sxjz.yml
  • 16af8c7c0f feat:今正配置添加
  • 对比 4 次代码提交 »

4 周之前