Commit Graph

Select branches

Hide Pull Requests

checkBack

contract

master

mssql

muti_db

v1.0

Mono Color

• f22c9b8eb0 测试环境，数据库数据有误，这个ID应该不用改的 15989082884@163.com 2023-07-16 15:21:24 +0800
• 7cfcda34ca 修复预算导出缺失政策信息 Yen 2023-07-15 15:46:35 +0800
• 0913d8b281 政策字段调整 Yen 2023-07-15 15:45:52 +0800
• 54d037528f 政策补偿 Yen 2023-07-15 14:29:41 +0800
• be7360b89a subList空指针 Yen 2023-07-15 14:15:10 +0800
• f76946aa66 Merge remote-tracking branch 'origin/v1.0' into v1.0 Yen 2023-07-15 11:02:47 +0800
• e795bf6bc6 debug Yen 2023-07-15 11:02:41 +0800
• 30d60bc771 预算查看 15989082884@163.com 2023-07-14 20:58:37 +0800
• b971d61c2f 修BUG 15989082884@163.com 2023-07-14 15:55:10 +0800
• fb221b8422 对帐单明细 和 汇总导出 15989082884@163.com 2023-07-14 12:31:06 +0800
• 12b8db02f4 BirActivityCenterGood添加核销分割；修改费用补偿；核销补偿；各审批编码修改；subList异常修复 Yen 2023-07-14 11:30:09 +0800
• 0d3fc29c88 调整 客户金额 和客户明细帐总帐的导出功能 15989082884@163.com 2023-07-14 00:12:41 +0800
• 085fcbfa9b 核销表添加costApplyId 15989082884@163.com 2023-07-13 16:14:41 +0800
• b7ca860bc0 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-13 16:01:06 +0800
• 354f3ebb5f 导出客户费用金额 15989082884@163.com 2023-07-13 16:00:14 +0800
• a640ea2b4a 添加费用申请时子表费率 Yen 2023-07-13 12:01:02 +0800
• 4bc923708d 修复自动冻结BUG 15989082884@163.com 2023-07-13 00:14:16 +0800
• 0aab443dfd Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-12 18:02:34 +0800
• 93b4c706c3 调整产品信息接口 返回 品牌品类系列名称 15989082884@163.com 2023-07-12 17:48:09 +0800
• 18fc9129d8 修复提交时可用费用异常 Yen 2023-07-12 11:58:11 +0800
• 196305dcfe 添加字段显示费用申请 产品信息 15989082884@163.com 2023-07-12 10:29:58 +0800
• 1553e6d51d 解除销售区域 和 行政区域最后一级限制 15989082884@163.com 2023-07-12 10:29:22 +0800
• 0a2ee4ffa0 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-12 02:17:19 +0800
• 4011bef6e8 台帐查询 15989082884@163.com 2023-07-12 02:16:16 +0800
• a0cc25d858 Web部署支持 Yen 2023-07-11 17:04:45 +0800
• afed258a0a 添加OA用户精确查询 Yen 2023-07-11 14:04:44 +0800
• 94838ca961 规划预算 15989082884@163.com 2023-07-10 20:20:27 +0800
• 8c99b1708c Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-10 16:56:07 +0800
• ca92a19cd6 台帐 15989082884@163.com 2023-07-10 16:55:39 +0800
• b9b2968fe9 改BUG，自动冻结时间取预计核销 15989082884@163.com 2023-07-10 16:55:30 +0800
• 3d61f6416e 解决H5页面权限不刷新 Yen 2023-07-10 15:47:37 +0800
• d6caf3cf33 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-10 10:04:34 +0800
• 63d9c68780 报表 15989082884@163.com 2023-07-10 10:03:43 +0800
• 8c7f75ae57 解决H5页面权限不刷新 Yen 2023-07-10 09:51:56 +0800
• 0b72a5bb4d Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-10 09:14:50 +0800
• 754a0c9096 报表 15989082884@163.com 2023-07-10 09:14:37 +0800
• c646a685fd 解决H5页面权限不刷新 Yen 2023-07-10 09:04:22 +0800
• 8fc345c91f Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-07 17:59:30 +0800
• fd2b7f5ff4 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-07 17:58:56 +0800
• 86a8aab539 区域BUG 15989082884@163.com 2023-07-07 17:58:43 +0800
• f6d86b25ee 活动，费用申请添加字段 Yen 2023-07-07 17:58:21 +0800
• e5bbf4125a 预算周期底表分割(未测试) Yen 2023-07-07 16:58:55 +0800
• ff5adcb6f3 预算周期底表分割 Yen 2023-07-07 16:36:03 +0800
• addff02b87 活动底表分割 Yen 2023-07-07 11:54:53 +0800
• 425d7aa7ea 活动底表分割 Yen 2023-07-07 11:54:20 +0800
• bb3dd7d892 活动底表分割 Yen 2023-07-06 17:42:20 +0800
• 7cfef793e3 活动底表分割 Yen 2023-07-06 16:59:06 +0800
• 22088e4516 添加模板字段 Yen 2023-07-06 16:56:04 +0800
• bbc1a79630 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-06 12:03:51 +0800
• 00178be5c6 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-06 12:00:55 +0800
• 4a5370b0d6 存货查询SQL BUG 15989082884@163.com 2023-07-06 12:00:47 +0800
• 29c692ad25 添加费用申请统计字段 Yen 2023-07-06 11:57:41 +0800
• 6e16c8853d 取消随货拦截 Yen 2023-07-06 10:38:39 +0800
• daa141a76b Merge remote-tracking branch 'origin/v1.0' into v1.0 Yen 2023-07-06 10:24:03 +0800
• b58a8dffe9 同步用户调整 Yen 2023-07-06 10:23:57 +0800
• a874b98aac SPU接口接参修复 15989082884@163.com 2023-07-06 09:25:44 +0800
• e567c25c0c 进场费查询调整 15989082884@163.com 2023-07-05 18:49:32 +0800
• fa6d683de4 根据IDS查预算，商品 15989082884@163.com 2023-07-05 18:12:55 +0800
• 9648d70213 保存activity时，传入模板指定预算ids，如模板预算存在，计算预算命中时，筛选预算ids 15989082884@163.com 2023-07-05 17:02:10 +0800
• 95cb011d4e 逾期时间BUG 15989082884@163.com 2023-07-05 16:59:25 +0800
• 0b8be6398f 添加预算IDS查询条件 15989082884@163.com 2023-07-05 14:51:04 +0800
• 199d2c9c04 核销时间筛选，用finishTime作为时间条件 15989082884@163.com 2023-07-05 11:43:44 +0800
• bc9dc7ff43 活动标题没有更新 15989082884@163.com 2023-07-05 11:37:19 +0800
• 65d1f73d61 添加进场记录模糊查询 15989082884@163.com 2023-07-05 11:35:43 +0800
• da2e60d1e8 修复科目GETBYID的父名称 15989082884@163.com 2023-07-05 11:35:19 +0800
• f1727f5508 政策的预算占用优化 Yen 2023-07-04 18:04:02 +0800
• 4db9d58ff2 默认密码校验；模板拓展接口 Yen 2023-07-04 16:35:03 +0800
• bdb221a047 修BUG，BIR为空报错，销售区域查询，USER的OA帐号为空 优化默认成本中心查询 15989082884@163.com 2023-07-04 11:15:51 +0800
• 5a8bd20d66 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-04 05:33:57 +0800
• 44c441422f 修复查询销售区域的BUG 15989082884@163.com 2023-07-04 05:33:49 +0800
• f6a56c4d49 Merge remote-tracking branch 'origin/v1.0' into v1.0 Yen 2023-07-04 05:32:51 +0800
• f74b6b5566 修改费用申请参数名,HIS表清空，对账单BUG Yen 2023-07-04 05:32:33 +0800
• 5d461bf510 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-03 18:17:55 +0800
• fce51434b8 费用率 15989082884@163.com 2023-07-03 18:17:48 +0800
• 8813181c47 修改费用申请参数名 Yen 2023-07-03 09:59:06 +0800
• 5785e0bd4b 费用率 15989082884@163.com 2023-07-02 17:32:49 +0800
• ac9778d8c7 目标发货额 OA传参 15989082884@163.com 2023-07-02 15:05:06 +0800
• faf2b690c4 预计发货 15989082884@163.com 2023-07-02 14:30:29 +0800
• 30347c0fb1 开启费用率更新 15989082884@163.com 2023-07-02 11:51:05 +0800
• 44803e7ade 审批调整 Yen 2023-07-02 10:18:36 +0800
• e4997f1d7b OA的费用率 15989082884@163.com 2023-07-02 09:30:33 +0800
• 26ce635192 费用率调整，加了 传去OA的几个费用率查询函数 15989082884@163.com 2023-07-01 15:46:27 +0800
• 3ac9becd11 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-07-01 00:10:00 +0800
• 9ed300740d 费用率 15989082884@163.com 2023-07-01 00:09:53 +0800
• cd8405daf5 进场费；审批调整 Yen 2023-06-30 19:08:28 +0800
• b9ad8de63f 进场费；审批调整 Yen 2023-06-30 18:15:15 +0800
• ae91dc34d3 费用率 15989082884@163.com 2023-06-30 18:14:17 +0800
• 31fb56c139 科目接口 BUG 15989082884@163.com 2023-06-30 14:52:20 +0800
• 91219630b5 费用率处理和计算 15989082884@163.com 2023-06-30 13:10:49 +0800
• e4f5084289 费用率 15989082884@163.com 2023-06-30 09:14:52 +0800
• f9f00e7480 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-06-29 21:59:53 +0800
• 2d3a2c12af 科目树，传入进场时，增加过滤 15989082884@163.com 2023-06-29 21:59:47 +0800
• f41cad7761 费率同步修复 Yen 2023-06-29 20:29:12 +0800
• 14d2ae0d35 Merge remote-tracking branch 'origin/v1.0' into v1.0 15989082884@163.com 2023-06-29 17:38:48 +0800
• 49f703fbfe 费用率BI 15989082884@163.com 2023-06-29 17:38:37 +0800
• 5f9e08d045 费用预览，可用预算调整 Yen 2023-06-29 17:36:02 +0800
• a60e6117f6 费用预览，可用预算调整 Yen 2023-06-29 16:09:49 +0800
• b32b01b140 费用预览，可用预算调整 Yen 2023-06-29 15:31:56 +0800
• b8887b2db4 整合同步按钮调整 Yen 2023-06-27 16:23:08 +0800
• e6d42c9292 整合同步按钮调整 Yen 2023-06-27 14:55:37 +0800