Главная Обзор Помощь
Регистрация Вход
caoliqin
Репозитории Активность

caoliqin запушил(а) master в root/ylrz_his_scrm_adminUI

1 неделя назад

caoliqin запушил(а) master в root/ylrz_his_scrm_doctorUI

1 неделя назад

caoliqin запушил(а) master в root/ylrz_his_scrm_doctorUI

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 запушил(а) openImAndLive в root/ylrz_his_scrm_java

  • 3bb152ce16 feat：处理福本源火山云视频上传

2 недель назад

caoliqin запушил(а) master в root/ylrz_his_scrm_java

2 недель назад

caoliqin запушил(а) master в root/ylrz_his_scrm_java

2 недель назад

caoliqin запушил(а) master в root/ylrz_his_scrm_java

3 недель назад

caoliqin запушил(а) openImAndLive в root/ylrz_his_scrm_java

  • e788f7fd34 福本源-同步金额到缓存（充值、扣款、红包退回）

3 недель назад

caoliqin запушил(а) master-fby в root/ylrz_his_scrm_adminUI

  • 19c5a604fa Merge remote-tracking branch 'origin/master'
  • 4009c3cfd5 必穿商品码
  • 5958390293 福本源-会员训练营-营期详情-课程统计-奖励金额总计的展示四舍五入
  • 5fef26b3b3 Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI
  • 4314d7b110 feat：订单-修改代收金额

3 недель назад

caoliqin создал новую ветку master-fby в root/ylrz_his_scrm_adminUI

3 недель назад

caoliqin запушил(а) openImAndLive в root/ylrz_his_scrm_java

3 недель назад

caoliqin запушил(а) openImAndLive в root/ylrz_his_scrm_java

  • e3a0f9a05f feat：福本源-会员营期看课统计过滤删除

3 недель назад

caoliqin запушил(а) openImAndLive в root/ylrz_his_scrm_java

3 недель назад

caoliqin запушил(а) openImAndLive в root/ylrz_his_scrm_java

  • 0d1a86c4a2 feat：合并代码冲突
  • c6fe6e9d1e Merge branch 'refs/heads/master' into openImAndLive # Conflicts: # fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesController.java # fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesItemController.java # fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesLogsController.java # fs-admin/src/main/java/com/fs/live/controller/LiveAutoTaskController.java # fs-admin/src/main/java/com/fs/live/controller/LiveCartController.java # fs-admin/src/main/java/com/fs/live/controller/LiveController.java # fs-admin/src/main/java/com/fs/live/controller/LiveDataController.java # fs-admin/src/main/java/com/fs/live/controller/LiveEventConfController.java # fs-admin/src/main/java/com/fs/live/controller/LiveGiftController.java # fs-admin/src/main/java/com/fs/live/controller/LiveGoodsController.java # fs-admin/src/main/java/com/fs/live/controller/LiveLotteryConfController.java # fs-admin/src/main/java/com/fs/live/controller/LiveLotteryRecordController.java # fs-admin/src/main/java/com/fs/live/controller/LiveLotteryRegistrationController.java # fs-admin/src/main/java/com/fs/live/controller/LiveMsgController.java # fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java # fs-admin/src/main/java/com/fs/live/controller/LiveOrderItemController.java # fs-admin/src/main/java/com/fs/live/controller/LiveOrderLogsController.java # fs-admin/src/main/java/com/fs/live/controller/LiveRedConfController.java # fs-admin/src/main/java/com/fs/live/controller/LiveRewardRecordController.java # fs-admin/src/main/java/com/fs/live/controller/LiveUserFavoriteController.java # fs-admin/src/main/java/com/fs/live/controller/LiveUserFollowController.java # fs-admin/src/main/java/com/fs/live/controller/LiveUserLikeController.java # fs-admin/src/main/java/com/fs/live/controller/LiveUserLotteryRecordController.java # fs-admin/src/main/java/com/fs/live/controller/LiveUserRedRecordController.java # fs-admin/src/main/java/com/fs/live/controller/LiveVideoController.java # fs-admin/src/main/java/com/fs/live/controller/LiveWatchConfigController.java # fs-admin/src/main/java/com/fs/live/controller/LiveWatchUserController.java # fs-common/src/main/java/com/fs/common/constant/LiveKeysConstant.java # fs-common/src/main/java/com/fs/common/core/redis/RedisCache.java # fs-company/src/main/java/com/fs/company/controller/live/LiveAutoTaskController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveDataController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveGiftController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveGoodsController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveLotteryConfController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveLotteryRecordController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveLotteryRegistrationController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveMsgController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveOrderController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveProfitController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveRedConfController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveRewardRecordController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveSensitiveWordsController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveUserFirstEntryController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveVideoController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveWatchConfigController.java # fs-company/src/main/java/com/fs/company/controller/live/LiveWatchUserController.java # fs-live-app/src/main/java/com/fs/app/controller/AppBaseController.java # fs-live-app/src/main/java/com/fs/app/controller/CommonController.java # fs-live-app/src/main/java/com/fs/app/controller/LiveController.java # fs-live-app/src/main/java/com/fs/app/controller/UserController.java # fs-live-app/src/main/java/com/fs/app/task/Task.java # fs-live-app/src/main/java/com/fs/app/vo/LiveVo.java # fs-live-app/src/main/java/com/fs/app/websocket/service/WebSocketServer.java # fs-live-app/src/main/java/com/fs/live/utils/CityTreeUtil.java # fs-live-app/src/main/java/com/fs/live/utils/VerifyUtils.java # fs-live-app/src/main/java/com/fs/live/utils/WxUtil.java # fs-live-app/src/main/java/com/fs/live/websocket/bean/SendMsgVo.java # fs-live-app/src/main/resources/application.yml # fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java # fs-service/src/main/java/com/fs/course/param/FsCourseWatchLogListParam.java # fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java # fs-service/src/main/java/com/fs/his/domain/FsUser.java # fs-service/src/main/java/com/fs/his/mapper/FsStoreProductMapper.java # fs-service/src/main/java/com/fs/his/service/IFsStoreProductService.java # fs-service/src/main/java/com/fs/his/service/IFsUserService.java # fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java # fs-service/src/main/java/com/fs/his/service/impl/FsStoreProductServiceImpl.java # fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java # fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java # fs-service/src/main/java/com/fs/live/domain/Live.java # fs-service/src/main/java/com/fs/live/domain/LiveAfterSales.java # fs-service/src/main/java/com/fs/live/domain/LiveAfterSalesItem.java # fs-service/src/main/java/com/fs/live/domain/LiveAfterSalesLogs.java # fs-service/src/main/java/com/fs/live/domain/LiveAnchor.java # fs-service/src/main/java/com/fs/live/domain/LiveAutoTask.java # fs-service/src/main/java/com/fs/live/domain/LiveCart.java # fs-service/src/main/java/com/fs/live/domain/LiveCompanyCode.java # fs-service/src/main/java/com/fs/live/domain/LiveData.java # fs-service/src/main/java/com/fs/live/domain/LiveEventConf.java # fs-service/src/main/java/com/fs/live/domain/LiveGift.java # fs-service/src/main/java/com/fs/live/domain/LiveGoods.java # fs-service/src/main/java/com/fs/live/domain/LiveLotteryConf.java # fs-service/src/main/java/com/fs/live/domain/LiveLotteryProductConf.java # fs-service/src/main/java/com/fs/live/domain/LiveLotteryRecord.java # fs-service/src/main/java/com/fs/live/domain/LiveLotteryRegistration.java # fs-service/src/main/java/com/fs/live/domain/LiveOrder.java # fs-service/src/main/java/com/fs/live/domain/LiveOrderItem.java # fs-service/src/main/java/com/fs/live/domain/LiveOrderLogs.java # fs-service/src/main/java/com/fs/live/domain/LiveOrderPayment.java # fs-service/src/main/java/com/fs/live/domain/LiveRedConf.java # fs-service/src/main/java/com/fs/live/domain/LiveRewardRecord.java # fs-service/src/main/java/com/fs/live/domain/LiveSensitiveWords.java # fs-service/src/main/java/com/fs/live/domain/LiveUserFavorite.java # fs-service/src/main/java/com/fs/live/domain/LiveUserFirstEntry.java # fs-service/src/main/java/com/fs/live/domain/LiveUserFollow.java # fs-service/src/main/java/com/fs/live/domain/LiveUserGift.java # fs-service/src/main/java/com/fs/live/domain/LiveUserLike.java # fs-service/src/main/java/com/fs/live/domain/LiveUserLotteryRecord.java # fs-service/src/main/java/com/fs/live/domain/LiveUserRedRecord.java # fs-service/src/main/java/com/fs/live/domain/LiveWatchConfig.java # fs-service/src/main/java/com/fs/live/domain/LiveWatchUser.java # fs-service/src/main/java/com/fs/live/dto/LiveOrderItemDTO.java # fs-service/src/main/java/com/fs/live/enums/LiveOrderCancleReason.java # fs-service/src/main/java/com/fs/live/mapper/LiveAfterSalesItemMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveAfterSalesLogsMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveAfterSalesMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveAnchorMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveAutoTaskMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveCartMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveCompanyCodeMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveDataMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveEventConfMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveGiftMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveGoodsMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveLotteryConfMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveLotteryProductConfMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveLotteryRecordMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveLotteryRegistrationMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveMsgMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveOrderItemMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveOrderLogsMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveOrderMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveOrderPaymentMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveRedConfMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveRewardRecordMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveSensitiveWordsMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveUserFavoriteMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveUserFirstEntryMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveUserFollowMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveUserGiftMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveUserLikeMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveUserLotteryRecordMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveUserRedRecordMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveVideoMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveWatchConfigMapper.java # fs-service/src/main/java/com/fs/live/mapper/LiveWatchUserMapper.java # fs-service/src/main/java/com/fs/live/param/LiveAfterSalesListUParam.java # fs-service/src/main/java/com/fs/live/param/LiveLotteryProduct.java # fs-service/src/main/java/com/fs/live/param/LiveLotteryProductSaveParam.java # fs-service/src/main/java/com/fs/live/param/LiveOrderSearchParam.java # fs-service/src/main/java/com/fs/live/service/ILiveAfterSalesItemService.java # fs-service/src/main/java/com/fs/live/service/ILiveAfterSalesLogsService.java # fs-service/src/main/java/com/fs/live/service/ILiveAfterSalesService.java # fs-service/src/main/java/com/fs/live/service/ILiveAnchorService.java # fs-service/src/main/java/com/fs/live/service/ILiveAutoTaskService.java # fs-service/src/main/java/com/fs/live/service/ILiveCartService.java # fs-service/src/main/java/com/fs/live/service/ILiveCompanyCodeService.java # fs-service/src/main/java/com/fs/live/service/ILiveDataService.java # fs-service/src/main/java/com/fs/live/service/ILiveEventConfService.java # fs-service/src/main/java/com/fs/live/service/ILiveGiftService.java # fs-service/src/main/java/com/fs/live/service/ILiveGoodsService.java # fs-service/src/main/java/com/fs/live/service/ILiveLotteryConfService.java # fs-service/src/main/java/com/fs/live/service/ILiveLotteryRecordService.java # fs-service/src/main/java/com/fs/live/service/ILiveLotteryRegistrationService.java # fs-service/src/main/java/com/fs/live/service/ILiveMsgService.java # fs-service/src/main/java/com/fs/live/service/ILiveOrderItemService.java # fs-service/src/main/java/com/fs/live/service/ILiveOrderLogsService.java # fs-service/src/main/java/com/fs/live/service/ILiveOrderPaymentService.java # fs-service/src/main/java/com/fs/live/service/ILiveOrderService.java # fs-service/src/main/java/com/fs/live/service/ILiveRedConfService.java # fs-service/src/main/java/com/fs/live/service/ILiveRewardRecordService.java # fs-service/src/main/java/com/fs/live/service/ILiveSensitiveWordsService.java # fs-service/src/main/java/com/fs/live/service/ILiveService.java # fs-service/src/main/java/com/fs/live/service/ILiveUserFavoriteService.java # fs-service/src/main/java/com/fs/live/service/ILiveUserFirstEntryService.java # fs-service/src/main/java/com/fs/live/service/ILiveUserFollowService.java # fs-service/src/main/java/com/fs/live/service/ILiveUserGiftService.java # fs-service/src/main/java/com/fs/live/service/ILiveUserLikeService.java # fs-service/src/main/java/com/fs/live/service/ILiveUserLotteryRecordService.java # fs-service/src/main/java/com/fs/live/service/ILiveUserRedRecordService.java # fs-service/src/main/java/com/fs/live/service/ILiveVideoService.java # fs-service/src/main/java/com/fs/live/service/ILiveWatchConfigService.java # fs-service/src/main/java/com/fs/live/service/ILiveWatchUserService.java # fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesItemServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesLogsServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveAnchorServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveAutoTaskServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveCartServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveCompanyCodeServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveDataServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveEventConfServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveGiftServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveGoodsServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveLotteryConfServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveLotteryRecordServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveLotteryRegistrationServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveMsgServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveOrderItemServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveOrderLogsServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveOrderPaymentServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveRedConfServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveRewardRecordServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveSensitiveWordsServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveUserFavoriteServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveUserFirstEntryServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveUserFollowServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveUserGiftServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveUserLikeServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveUserLotteryRecordServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveUserRedRecordServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveVideoServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveWatchConfigServiceImpl.java # fs-service/src/main/java/com/fs/live/service/impl/LiveWatchUserServiceImpl.java # fs-service/src/main/java/com/fs/live/vo/ColumnsConfigVo.java # fs-service/src/main/java/com/fs/live/vo/LiveAfterSalesListUVO.java # fs-service/src/main/java/com/fs/live/vo/LiveCartVo.java # fs-service/src/main/java/com/fs/live/vo/LiveGoodsListVo.java # fs-service/src/main/java/com/fs/live/vo/LiveGoodsVo.java # fs-service/src/main/java/com/fs/live/vo/LiveLotteryConfVo.java # fs-service/src/main/java/com/fs/live/vo/LiveLotteryProductListVo.java # fs-service/src/main/java/com/fs/live/vo/LiveOrderItemListUVO.java # fs-service/src/main/java/com/fs/live/vo/LiveOrderListVo.java # fs-service/src/main/java/com/fs/live/vo/LiveQuestionLiveVO.java # fs-service/src/main/java/com/fs/live/vo/LiveUserFirstProfit.java # fs-service/src/main/java/com/fs/live/vo/LiveWatchUserVO.java # fs-service/src/main/resources/application-druid-nmgyt.yml # fs-service/src/main/resources/mapper/company/CompanyMapper.xml # fs-service/src/main/resources/mapper/live/LiveAfterSalesMapper.xml # fs-service/src/main/resources/mapper/live/LiveAutoTaskMapper.xml # fs-service/src/main/resources/mapper/live/LiveCartMapper.xml # fs-service/src/main/resources/mapper/live/LiveDataMapper.xml # fs-service/src/main/resources/mapper/live/LiveGiftMapper.xml # fs-service/src/main/resources/mapper/live/LiveGoodsMapper.xml # fs-service/src/main/resources/mapper/live/LiveLotteryProductConfMapper.xml # fs-service/src/main/resources/mapper/live/LiveLotteryRegistrationMapper.xml # fs-service/src/main/resources/mapper/live/LiveMapper.xml # fs-service/src/main/resources/mapper/live/LiveMsgMapper.xml # fs-service/src/main/resources/mapper/live/LiveOrderItemMapper.xml # fs-service/src/main/resources/mapper/live/LiveOrderMapper.xml # fs-service/src/main/resources/mapper/live/LiveOrderPaymentErrorMapper.xml # fs-service/src/main/resources/mapper/live/LiveOrderPaymentMapper.xml # fs-service/src/main/resources/mapper/live/LiveRewardRecordMapper.xml # fs-service/src/main/resources/mapper/live/LiveUserFirstEntryMapper.xml # fs-service/src/main/resources/mapper/live/LiveUserLotteryRecordMapper.xml # fs-service/src/main/resources/mapper/live/LiveUserRedRecordMapper.xml # fs-service/src/main/resources/mapper/live/LiveWatchUserMapper.xml # fs-user-app/src/main/java/com/fs/app/vo/LotteryVo.java # fs-user-app/src/main/resources/application.yml
  • 30b6015332 Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java
  • 443e3d7711 feat：修改代收金额
  • d5ef362e21 木易华康-app看课路径修改
  • Просмотр сравнение для этих 1325 коммитов »

3 недель назад

caoliqin запушил(а) master в root/ylrz_his_scrm_companyUI

3 недель назад

caoliqin запушил(а) master в root/ylrz_his_scrm_adminUI

3 недель назад