Commits · 80a105bf588c9b285cd737f937bf90be0f5cffbe · 王衍超 / cloud-fb · GitLab

12 May, 2021 12 commits
- 统计整体调整 · 80a105bf
  wukaiqiang authored May 12, 2021
  
  80a105bf Browse Files
- 销售汇总统计更新 · da663915
  wukaiqiang authored May 12, 2021
  
  da663915 Browse Files
- 回款明细增加资金类型 · 2eb2a994
  wukaiqiang authored May 12, 2021
  
  2eb2a994 Browse Files
- Merge branch 'develop' into feature/sales_record_sync · a8d58291
```
# Conflicts:
#	backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesSummaryAdvQuery.jmx
```
  wukaiqiang authored May 12, 2021
  a8d58291 Browse Files
- 完善预付款存款调度 · 5d7c29de
  wukaiqiang authored May 12, 2021
  
  5d7c29de Browse Files
- 提交高级查询jmx修改 · 0e59c54f
  shiwenbo authored May 12, 2021
  
  0e59c54f Browse Files
- 经营报表 · 89375ed0
  杨清松 authored May 12, 2021
  
  89375ed0 Browse Files
- Merge branch 'feature/sales_record_sync' into 'develop' · b8660ca6
```
统计测试版本-2021-05-12-13:53

See merge request kunlun/xyst_dinas/xyst_dinas_backend!10
```
  焦凯 authored May 12, 2021
  b8660ca6 Browse Files
- 统计测试版本-2021-05-12-13:53 · da994550
  wukaiqiang authored May 12, 2021
  
  da994550 Browse Files
- 预付款及结余汇总 · d74c0b4a
  杨清松 authored May 12, 2021
  
  d74c0b4a Browse Files
- Merge branch 'feature/sales_record_sync' into 'develop' · 8ae2af38
```
经营类统计初版

See merge request kunlun/xyst_dinas/xyst_dinas_backend!9
```
  wukaiqiang authored May 12, 2021
  8ae2af38 Browse Files
- 经营类统计初版 · f310dd19
  wukaiqiang authored May 12, 2021
  
  f310dd19 Browse Files
11 May, 2021 26 commits
- Merge branch 'feature/sales_record_sync' into 'develop' · 82359872
```
Feature/sales record sync

See merge request kunlun/xyst_dinas/xyst_dinas_backend!8
```
  wukaiqiang authored May 11, 2021
  82359872 Browse Files
- Merge branch 'develop' into feature/sales_record_sync · 4dfb290d
```
# Conflicts:
#	backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/AdvancePaymentBalanceSumAdvQuery.jmx
#	backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx
```
  wukaiqiang authored May 11, 2021
  4dfb290d Browse Files
- 补充提交 · 6bf14294
  wukaiqiang authored May 11, 2021
  
  6bf14294 Browse Files
- 预付款及余额汇总提交 · 177c4fd6
  wukaiqiang authored May 11, 2021
  
  177c4fd6 Browse Files
- 增加区域公司单位项目查询表定义 · bed4c77f
  shiwenbo authored May 11, 2021
  
  bed4c77f Browse Files
- 生产线添加区域公司 · 8b1cf301
  高晓磊 authored May 11, 2021
  
  8b1cf301 Browse Files
- 摄像头添加所属流域id · 629b3809
  高晓磊 authored May 11, 2021
  
  629b3809 Browse Files
- 统一根据区域公司筛选的方法 · 4389a68c
  高晓磊 authored May 11, 2021
  
  4389a68c Browse Files
- 散户登记中添加场站类型的修改人 · 0eca20e4
  高晓磊 authored May 11, 2021
  
  0eca20e4 Browse Files
- 人员违规记录和车辆违规记录 · 247cebc8
  高晓磊 authored May 11, 2021
  
  247cebc8 Browse Files
- 预警设置默认open修改为true · 34bb0b67
  高晓磊 authored May 11, 2021
  
  34bb0b67 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 8dd73531
  高晓磊 authored May 11, 2021
  
  8dd73531 Browse Files
- 统一根据区域公司筛选的方法 · 920e60c2
  高晓磊 authored May 11, 2021
  
  920e60c2 Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · ee722425
  shiwenbo authored May 11, 2021
  
  ee722425 Browse Files
- 修改合同中对场站的关联 · 8574d8ee
  shiwenbo authored May 11, 2021
  
  8574d8ee Browse Files
- 集团用户获取不到最新砂价的bug · ce7f75b1
  高晓磊 authored May 11, 2021
  
  ce7f75b1 Browse Files
- 调整单位项目查询表格列宽 · 2536052c
  shiwenbo authored May 11, 2021
  
  2536052c Browse Files
- 报表包名更改 · 397c784c
  杨清松 authored May 11, 2021
  
  397c784c Browse Files
- 修改获取部门接口 · c1c90ad7
  shiwenbo authored May 11, 2021
  
  c1c90ad7 Browse Files
- 修改单位项目查询SQL · d8c00855
  shiwenbo authored May 11, 2021
  
  d8c00855 Browse Files
- 修改单位项目查询SQL · b07e4833
  shiwenbo authored May 11, 2021
  
  b07e4833 Browse Files
- 销售台账查询元数据区分购砂用户 · eda2ba47
  杨清松 authored May 11, 2021
  
  eda2ba47 Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · c22b08c1
  shiwenbo authored May 11, 2021
  
  c22b08c1 Browse Files
- 合同模型中删除场站 · 4364fab2
  shiwenbo authored May 11, 2021
  
  4364fab2 Browse Files
- Merge branch 'feature/sales_record_sync' into 'develop' · 770cb242
```
)销售汇总、回款明细（未加查询条件）

See merge request kunlun/xyst_dinas/xyst_dinas_backend!7
```
  焦凯 authored May 11, 2021
  770cb242 Browse Files
- )销售汇总、回款明细（未加查询条件） · a59c4b7b
  wukaiqiang authored May 11, 2021
  
  a59c4b7b Browse Files
10 May, 2021 2 commits
- 对账单问题解决 · 2c6e8c38
  杨清松 authored May 10, 2021
  
  2c6e8c38 Browse Files
- 修改错误 · d600db6d
  shiwenbo authored May 10, 2021
  
  d600db6d Browse Files