Commits · 56543b8db4a3db7122f44ec05169083901318b4b · phsl / admin

23 Apr, 2024 1 commit

Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev · 56543b8d

# Conflicts:
#	src/views/crm/statistics/performance/components/ContractCountPerformance.vue
#	src/views/crm/statistics/performance/components/ContractPricePerformance.vue
#	src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
#	src/views/crm/statistics/performance/index.vue

committed Apr 23, 2024

56543b8d Browse Files

19 Apr, 2024 1 commit

1, 修改数据列表无法刷新的问题； · f4dd1bed

2， 修改时间选择，后端按照年实现的，前端同样按照年份选择实现；
3，修改环比同比计算；
4，回款金额统计bug修复。

committed Apr 19, 2024

f4dd1bed Browse Files

18 Apr, 2024 3 commits
- crm：code review 销售漏斗 · f5d01318
  YunaiV committed Apr 18, 2024
  
  f5d01318 Browse Files
- !428 CRM: 新增商机赢单转化率分析 · 50ab8646
```
Merge pull request !428 from puhui999/dev-crm
```
  芋道源码 committed Apr 18, 2024
  50ab8646 Browse Files
- !429 fix: Permissions filled in incorrectly · b1c832d2
```
Merge pull request !429 from AhJindeg/hotfix/hasPermi
```
  芋道源码 committed Apr 18, 2024
  b1c832d2 Browse Files
16 Apr, 2024 8 commits
- fix: 🐞 fix sensitiveWord hasPermi value · ac6618a9
  AhJindeg committed Apr 16, 2024
  
  ac6618a9 Browse Files
- fix: 🐞 fix post hasPermi value · decdd1b2
  AhJindeg committed Apr 16, 2024
  
  decdd1b2 Browse Files
- fix: 🐞 fix operatelog hasPermi value · 97c8cefb
  AhJindeg committed Apr 16, 2024
  
  97c8cefb Browse Files
- fix: 🐞 fix template hasPermi value · bfb69ccc
  AhJindeg committed Apr 16, 2024
  
  bfb69ccc Browse Files
- fix: 🐞 fix loginlog hasPermi value · 958ec41f
  AhJindeg committed Apr 16, 2024
  
  958ec41f Browse Files
- fix: 🐞 fix fileConfig hasPermi value · dc5bede0
  AhJindeg committed Apr 16, 2024
  
  dc5bede0 Browse Files
- fix: 🐞 fix file hasPermi value · 75552683
  AhJindeg committed Apr 16, 2024
  
  75552683 Browse Files
- fix: 🐞 fix apiAccessLog hasPermi value · 221f78aa
  AhJindeg committed Apr 16, 2024
  
  221f78aa Browse Files
15 Apr, 2024 3 commits
- CRM: 新增商机赢单转化率分析 · 4e640bae
  puhui999 committed Apr 15, 2024
  
  4e640bae Browse Files
- CRM: 新增商机赢单转化率分析 · 014d1f8c
  puhui999 committed Apr 15, 2024
  
  014d1f8c Browse Files
- CRM: 完善销售漏斗 · 6acfc77d
  puhui999 committed Apr 15, 2024
  
  6acfc77d Browse Files
14 Apr, 2024 12 commits
- crm：code review 销售漏斗 · 25122530
  YunaiV committed Apr 14, 2024
  
  25122530 Browse Files
- crm：code review 销售漏斗 · c331a83b
  YunaiV committed Apr 14, 2024
  
  c331a83b Browse Files
- !426 CRM: 完善销售漏斗分析 · 56829ff9
```
Merge pull request !426 from puhui999/dev-crm
```
  芋道源码 committed Apr 14, 2024
  56829ff9 Browse Files
- !419 feat: 客户成交周期分析(按区域、按产品) · 6037ac40
```
Merge pull request !419 from dhb52/dev
```
  芋道源码 committed Apr 14, 2024
  6037ac40 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 1f0ef782
  YunaiV committed Apr 14, 2024
  
  1f0ef782 Browse Files
- !422 Infra模块>代码生成器>适配达梦数据库 · 1c469300
```
Merge pull request !422 from 再见七月/infraBug-by-dm
```
  芋道源码 committed Apr 14, 2024
  1c469300 Browse Files
- Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 · 7ba611bd
  YunaiV committed Apr 14, 2024
  
  7ba611bd Browse Files
- !421 fix(UserImportForm): fix a bunch of bugs · aba61120
```
Merge pull request !421 from AhJindeg/hotfix-UserImportForm
```
  芋道源码 committed Apr 14, 2024
  aba61120 Browse Files
- Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 · e885bf2f
  YunaiV committed Apr 14, 2024
  
  e885bf2f Browse Files
- !424 fix:部署报错移除多余的代码 · ddfa0a5a
```
Merge pull request !424 from 李占宏/dev
```
  芋道源码 committed Apr 14, 2024
  ddfa0a5a Browse Files
- !425 fix:部署报错移除多余的代码 · 855987d5
```
Merge pull request !425 from 李占宏/dev
```
  芋道源码 committed Apr 14, 2024
  855987d5 Browse Files
- CRM: 完善新增商机分析 · bc95dc29
  puhui999 committed Apr 14, 2024
  
  bc95dc29 Browse Files
13 Apr, 2024 3 commits
- CRM: 完善销售漏斗分析 · 3c49ed57
  puhui999 committed Apr 14, 2024
  
  3c49ed57 Browse Files
- fix:移除多余的代码 · 2f0fdd1d
  zhanhong committed Apr 13, 2024
  
  2f0fdd1d Browse Files
- CRM: 完善用户画像数据统计 · 2d7bab8a
  puhui999 committed Apr 13, 2024
  
  2d7bab8a Browse Files
12 Apr, 2024 1 commit
- Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 · ab1c5062
  YunaiV committed Apr 12, 2024
  
  ab1c5062 Browse Files
11 Apr, 2024 4 commits
- README：移除 resilience4j 组件，增加分布式锁 · 99addf2c
  YunaiV committed Apr 11, 2024
  
  99addf2c Browse Files
- CRM: 完善用户画像数据统计 · 64af029c
  puhui999 committed Apr 11, 2024
  
  64af029c Browse Files
- fix(UserImportForm): 🐞 add update formLoading and dialogVisible to submitFormSuccess · 47938975
  AhJindeg committed Apr 11, 2024
  
  47938975 Browse Files
- fix(UserImportForm): 🐞 add init updateSupport to open · 786468f4
  AhJindeg committed Apr 11, 2024
  
  786468f4 Browse Files
10 Apr, 2024 2 commits
- 修复 Infra 模块: · 1f517c3f
```
修复项目迁移达梦8数据库后,代码生成器导入功能报错的原因：
调整策略：删除-> autoIncrement <-字段
```
  byeJuly committed Apr 10, 2024
  1f517c3f Browse Files
- fix(UserImportForm): 🐞 add nextTick to resetForm · 4c15e667
  AhJindeg committed Apr 10, 2024
  
  4c15e667 Browse Files
09 Apr, 2024 1 commit
- refactor: 统一处理null数据为'未知' · 5358863f
  dhb52 committed Apr 09, 2024
  
  5358863f Browse Files
08 Apr, 2024 1 commit
- feat: 客户成交周期分析(按区域、按产品) · 0e15d6c9
  dhb52 committed Apr 09, 2024
  
  0e15d6c9 Browse Files