Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• aead83c5f7 增加异步注解 zhangqinbin 2022-01-14 12:06:33 +08:00
• 56c8c901de 增加异步注解 zhangqinbin 2022-01-14 12:05:06 +08:00
• 64fc286e33 添加过滤器：seata解绑 付庆吉 2022-01-13 19:09:57 +08:00
• 6ae13e4433 修改排序字段 付庆吉 2022-01-13 11:10:04 +08:00
• d84011f5a1 修改排序字段 付庆吉 2022-01-13 10:15:48 +08:00
• d828afee12 报价等字段去掉小数点 付庆吉 2022-01-13 10:04:28 +08:00
• 863e3678e4 【生产】报表打印-评审报告中评审结果排序问题、报价等字段去掉小数点 付庆吉 2022-01-13 09:33:41 +08:00
• 7a3ec743cb Merge branch 'uat' into 'master' 付庆吉 2022-01-06 09:10:27 +08:00
• 63d4401be8 Merge branch 'uat-v2' into 'uat' 付庆吉 2022-01-06 09:06:40 +08:00
• adb3297b74 修改pom版本号 付庆吉 2022-01-06 09:05:13 +08:00
• 78bd4fd761 Merge branch 'sim' into 'master' 张银雪 2021-11-18 22:16:39 +08:00
• e0604ab300 删除 zhangyx 2021-11-18 22:16:19 +08:00
• 9588cbe43e Merge branch 'sim' into 'master' 张银雪 2021-11-18 17:09:12 +08:00
• f5cc95423e 去掉短信接口client的url地址 liuh 2021-11-18 16:50:51 +08:00
• 24efaaa6f0 Merge remote-tracking branch 'remotes/origin/uat' into uat-v2 zhangyx 2021-11-18 15:25:27 +08:00
• d4974abe58 天擎短信不抛异常 zhangyx 2021-11-18 15:24:35 +08:00
• bc41f8eb6d Merge remote-tracking branch 'remotes/origin/uat' into uat-v2 zhangyx 2021-11-12 13:59:31 +08:00
• 0c20a391d1 修改xml内路径 zhangyx 2021-11-12 13:58:46 +08:00
• cd6b98cad4 修改xml内路径 zhangyx 2021-11-12 13:58:01 +08:00
• 89daa046df Merge remote-tracking branch 'remotes/origin/uat' into uat-v2 zhangyx 2021-11-12 10:13:43 +08:00
• 0e3a0403cd 修改配置文件 zhangyx 2021-11-12 10:12:20 +08:00
• c0e4844549 修改配置文件 zhangyx 2021-11-12 10:11:03 +08:00
• a6ae72a20f 修改配置文件 zhangyx 2021-11-12 10:09:59 +08:00
• 739ba6d06d Merge remote-tracking branch 'remotes/origin/uat' into dev zhangyx 2021-11-12 09:48:26 +08:00
• 480b02904d 短信功能增加开关 zhangyx 2021-11-11 15:18:51 +08:00
• 471227db7d 短信功能增加开关 zhangyx 2021-11-11 14:59:01 +08:00
• f253e8d0cb 发短信功能改成不往数据库记日志，改成log输出了 zhangyx 2021-11-08 16:56:50 +08:00
• cb6aeae472 Merge branch 'uat' into 'master' 付庆吉 2021-10-29 16:00:45 +08:00
• 7580d91910 Merge branch 'uat-v2' into 'uat' 付庆吉 2021-10-29 16:00:10 +08:00
• 8d22ec7ef0 新增根据token获取用户信息接口 付庆吉 2021-10-25 15:39:23 +08:00
• 21cb9310c1 定时任务发送人发送人名给固定值 zhangyx 2021-10-25 15:34:34 +08:00
• 5b53bd733d 定时任务发送人发送人名给固定值 zhangyx 2021-10-25 14:58:10 +08:00
• 6d26b06ea6 Merge branch 'uat' into 'uat-v2' 付庆吉 2021-10-25 11:09:42 +08:00
• 809caa25e7 未进入评审室的供应商，不应在报表打印里出现 付庆吉 2021-10-25 11:07:57 +08:00
• fce49c2915 Merge branch 'uat' into 'uat-v2' 付庆吉 2021-10-25 10:29:57 +08:00
• 5b6ff0dba3 【生产】未进入评审室的供应商，不应在报表打印里出现 付庆吉 2021-10-25 10:29:03 +08:00
• 4c157090cb 脚手架v2 付庆吉 2021-10-21 08:36:04 +08:00
• 522ba62744 Merge branch 'master' into 'uat' 付庆吉 2021-10-20 10:59:05 +08:00
• cc88da3659 Merge branch 'sim' into 'master' 张芹彬 2021-09-29 16:21:31 +08:00
• 02031a2bf1 Merge branch 'uat' into sim zhangqinbin 2021-09-29 16:09:58 +08:00
• a72464c0f0 发送短信接口 zhangyx 2021-09-24 14:49:28 +08:00
• 3a65d04c83 发送短信接口 zhangyx 2021-09-24 13:40:59 +08:00
• 168e309ea3 Merge remote-tracking branch 'remotes/origin/dev' into dev_sendMsg zhangyx 2021-09-18 08:50:41 +08:00
• d74b1aa932 定时任务本地测试日志输出 dxc 2021-09-17 15:21:03 +08:00
• 62c3b62c29 定时任务测试日志 dxc 2021-09-17 14:22:25 +08:00
• 7be724f71a 定时任务测试 dxc 2021-09-17 14:10:48 +08:00
• 900d8cc6ca 定时任务测试 dxc 2021-09-17 13:41:50 +08:00
• a904822322 Merge remote-tracking branch 'origin/dev' into dev dxc 2021-09-17 13:38:31 +08:00
• 19ceaf20d9 定时任务测试 dxc 2021-09-17 13:37:51 +08:00
• d8f8520784 UAT区块链代码测试 zhangqinbin 2021-09-16 10:00:55 +08:00
• 607538bb52 UAT区块链代码测试 zhangqinbin 2021-09-16 09:45:08 +08:00
• 3b04bb1de3 区块链调试 zhangqinbin 2021-09-15 15:59:16 +08:00
• 36297fbc4c 区块链调试 zhangqinbin 2021-09-15 15:07:27 +08:00
• a9794f0a87 Merge remote-tracking branch 'origin/uat' into uat zhangqinbin 2021-09-15 14:47:32 +08:00
• 4b31184ba1 区块链调试 zhangqinbin 2021-09-15 14:46:31 +08:00
• 3215c1e121 区块链根据mconfig.bss.app-secret 修改请求路径 yss 2021-09-15 11:20:31 +08:00
• d5ecebbf81 区块链根据mconfig.bss.app-secret 修改请求路径 yss 2021-09-15 11:14:01 +08:00
• 1ded8d58c7 区块链根据mconfig.bss.app-secret 修改请求路径 yss 2021-09-15 11:07:17 +08:00
• daa3566c43 区块链根据mconfig.bss.app-secret 修改请求路径 yss 2021-09-15 10:58:48 +08:00
• 476583936d 区块链修改为生产环境配置 yss 2021-09-14 11:29:34 +08:00
• 1ffcb167f9 区块链修改为生产环境配置 yss 2021-09-14 11:23:48 +08:00
• db24820fe1 区块链调试 zhangqinbin 2021-09-07 14:06:03 +08:00
• 2d62fa27e6 区块链调试 zhangqinbin 2021-09-06 16:44:44 +08:00
• 36dd6eacf2 区块链调试 zhangqinbin 2021-09-06 16:36:44 +08:00
• 7a8c26f1cb 区块链调试 zhangqinbin 2021-09-06 16:20:28 +08:00
• d3d1749d5e 区块链调试 zhangqinbin 2021-09-06 15:48:29 +08:00
• 5af0522e46 区块链调试 zhangqinbin 2021-09-06 15:14:22 +08:00
• 21568b7a4e 区块链调试 zhangqinbin 2021-09-06 14:57:07 +08:00
• b5b7c44c0e Merge branch 'dev' into uat zhangqinbin 2021-09-06 09:57:07 +08:00
• a3c7f2c559 Merge remote-tracking branch 'origin/dev' into dev zhangqinbin 2021-09-06 09:56:28 +08:00
• fa2515d851 传入加密参数保留null zhangqinbin 2021-09-06 09:55:58 +08:00
• 69300f6248 区块链日志 yss 2021-09-03 15:06:30 +08:00
• 29fdbeae66 区块链调试 zhangqinbin 2021-09-03 13:48:11 +08:00
• aa9409284b 区块链调试 zhangqinbin 2021-09-03 13:46:34 +08:00
• c804ba736f Merge branch 'dev' into uat zhangqinbin 2021-09-03 09:30:10 +08:00
• 9c22f3ee0f 区块链调试 zhangqinbin 2021-09-03 08:56:21 +08:00
• 8703cde5a0 Merge branch 'dev' into uat zhangqinbin 2021-09-02 18:30:04 +08:00
• 94ffa556a8 区块链调试 zhangqinbin 2021-09-02 17:52:26 +08:00
• 0fca6f592b 区块链调试 zhangqinbin 2021-09-02 17:38:37 +08:00
• eef573f4f9 区块链调试 zhangqinbin 2021-09-02 17:03:12 +08:00
• f67f010eeb 区块链调试 zhangqinbin 2021-09-02 16:43:13 +08:00
• b240cd0542 区块链调试 zhangqinbin 2021-09-02 16:23:23 +08:00
• b24c569935 区块链调试 zhangqinbin 2021-09-02 15:55:37 +08:00
• 6edd9a309e 区块链调试 zhangqinbin 2021-09-02 15:46:38 +08:00
• 950800d8aa 区块链调试 zhangqinbin 2021-09-02 14:36:08 +08:00
• 29823625ce 区块链调用 zhangqinbin 2021-09-02 11:10:53 +08:00
• c4716f9773 区块链调用 zhangqinbin 2021-09-02 10:23:12 +08:00
• a6b7c7f440 区块链调用 zhangqinbin 2021-09-02 10:20:39 +08:00
• 83bd8ac438 区块链调用 zhangqinbin 2021-09-02 10:03:00 +08:00
• ae23f4700c 区块链调用 zhangqinbin 2021-09-01 17:17:36 +08:00
• 5db12afeaf 区块链调用 zhangqinbin 2021-09-01 16:52:36 +08:00
• 7ffab25e88 区块链调用 zhangqinbin 2021-09-01 14:17:47 +08:00
• 662ce797ba 区块链调用 zhangqinbin 2021-09-01 14:15:23 +08:00
• 08acacf59c 区块链调用 zhangqinbin 2021-09-01 14:00:03 +08:00
• 0dc021ef7f Merge remote-tracking branch 'origin/dev' into dev zhangqinbin 2021-08-31 18:11:31 +08:00
• d51eb8dba5 区块链调用 zhangqinbin 2021-08-31 18:11:11 +08:00
• 6ec8574aab Merge remote-tracking branch 'origin/dev' into dev yss 2021-08-31 15:31:00 +08:00
• d7c556b903 区块链日志 yss 2021-08-31 15:30:49 +08:00
• 91b3957c44 区块链调用 zhangqinbin 2021-08-31 13:56:44 +08:00
• a3c404986f 区块链调用 zhangqinbin 2021-08-31 10:39:06 +08:00