Commit Graph

700 Commits

Author SHA1 Message Date
xiang2lin 07401992c6 资金归集 2025-04-11 11:25:40 +08:00
xiang2lin 21722c1b73 Merge branch 'fw-oa' of http://ufidahz.com.cn:9015/hzya/kangarooDataCenterV3 into ht
# Conflicts:
#	fw-oa/src/main/java/com/hzya/frame/seeyon/paybill/dao/IPayBillDao.java
#	fw-oa/src/main/java/com/hzya/frame/seeyon/paybill/dao/impl/PayBillDaoImpl.java
#	fw-oa/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java
#	fw-oa/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
#	fw-oa/src/main/java/com/hzya/frame/seeyon/paybill/service/IPayBillService.java
#	fw-oa/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java
#	fw-oa/src/main/java/com/hzya/frame/seeyon/recbill/service/impl/RecBillServiceImpl.java
#	fw-oa/src/main/java/com/hzya/frame/seeyon/service/ISeeYonInterFace.java
#	fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/SeeYonInterFaceImpl.java
#	fw-oa/src/main/java/com/hzya/frame/seeyon/util/OABipUtil.java
2025-04-11 09:00:25 +08:00
xiang2lin c81ea615c0 Merge branch 'ht' of http://ufidahz.com.cn:9015/hzya/kangarooDataCenterV3 into ht 2025-04-11 08:42:32 +08:00
hecan d748cf9825 查询申请单详情 2025-04-10 12:19:24 +08:00
lvleigang 330d4ffbd5 Merge branch 'ht' of http://ufidahz.com.cn:9015/hzya/kangarooDataCenterV3 into ht 2025-04-09 15:31:34 +08:00
lvleigang e243a78e22 修改密码 2025-04-09 15:27:27 +08:00
xiang2lin 5edaa85c41 Merge branch 'ht' of http://ufidahz.com.cn:9015/hzya/kangarooDataCenterV3 into ht 2025-04-08 13:45:30 +08:00
hecan 6f0c9cf45c 开票申请和查询申请单详情,以及中信电子回单上传OA 2025-04-08 10:51:36 +08:00
xiang2lin 8f49409b11 Merge branch 'ht' of http://ufidahz.com.cn:9015/hzya/kangarooDataCenterV3 into ht 2025-04-07 17:25:56 +08:00
476474485@qq.com a6af70de5f 调整OA插件调用方式 2025-04-07 16:49:25 +08:00
lvleigang e0f5d5f5ea 中台测试环境 2025-04-07 11:13:17 +08:00
hecan 3ad580bd34 Merge remote-tracking branch 'origin/ht' into ht 2025-04-02 17:08:24 +08:00
hecan 29bfbb3107 中信电子回单 2025-04-02 17:08:00 +08:00
xiang2lin d3ce01de28 测试类 2025-04-02 16:44:49 +08:00
lvleigang f65003d34c Merge branch 'ht' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into ht 2025-04-02 14:59:25 +08:00
lvleigang aecbb8e577 云账房 2025-04-02 14:57:23 +08:00
xiang2lin c7472dead7 合同评审超期合同流程终止 2025-04-01 11:51:56 +08:00
hecan 29113c35f1 中信公私钥加密方式 2025-03-26 17:04:07 +08:00
hecan 1a41553fb2 yml中增加中信公钥私钥 2025-03-24 11:30:30 +08:00
hecan e9bdda5cf0 代码从sysnew中移出 2025-03-24 11:27:54 +08:00
hecan b906b24c8e 付款单推送中信银行 2025-03-20 15:08:43 +08:00
yuqh dc9aed7833 文件配置 2025-03-20 14:59:12 +08:00
hecan 5624b62967 付款单推送中信银行 2025-03-20 14:45:52 +08:00
yuqh cff6f09b50 文件配置 2025-03-20 14:26:43 +08:00
yuqh 155e5fbb01 1 2025-03-19 11:04:53 +08:00
lvleigang 6b0232e12d post转发ssl认证去除 2025-02-18 16:36:56 +08:00
lvleigang f9b2ebaa7f 修改下发like拼接方法 2024-12-19 14:08:08 +08:00
lvleigang ffb86f43fa esb文件上传 2024-12-09 15:45:16 +08:00
lvleigang f73d39fe1c 主数据修改状态逻辑修改 2024-11-13 10:49:00 +08:00
lvleigang 5a63afd7d8 修改转发描述 2024-11-07 10:03:03 +08:00
lvleigang 21007598a9 钉钉代办更新 2024-10-24 15:02:47 +08:00
lvleigang c943cd82fb 自动数据库备份,备份后用sftp上传 2024-10-22 14:33:30 +08:00
xiang2lin ed5d7fff69 feat: token名字变更,由token变更为zt-token 2024-09-30 11:20:30 +08:00
lvleigang 1d979524f3 Merge branch 'master' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 2024-09-25 16:52:07 +08:00
lvleigang 23d06b59bb 集成任务添加状态字段 2024-09-25 16:52:00 +08:00
username 5eea8dfb96 消息模块,历史消息按推送时间排序 2024-09-25 16:15:11 +08:00
xiang2lin 90386c59a5 fix: 调用完根据授权码获取用户信息后 解析返回报文错误修改 2024-09-25 15:26:41 +08:00
xiang2lin aa591dc1ff fix: 调用完根据授权码获取用户信息后 解析返回报文错误修改 2024-09-25 15:19:16 +08:00
username ae266436d9 插件管理增加插件类型、集成任务日志明细根据插件类型分类任务名称 2024-09-24 16:17:58 +08:00
xiang2lin 62cf866111 删除fw-weixin在master上的代码 2024-09-24 11:36:23 +08:00
xiang2lin 351a7e7a7a fix: 注释 fw-weixin的引用 2024-09-24 11:34:27 +08:00
xiang2lin 5f6648144c fix:
去掉没用的依赖
2024-09-24 11:16:02 +08:00
xiang2lin f582a9601c feat: 添加子模块fw-weixin 2024-09-24 11:13:13 +08:00
xiang2lin c398ecde8b feat: 依赖fw-weixin 2024-09-24 11:12:43 +08:00
xiang2lin 0baa4e0bf3 feat: 企业微信单点登录 2024-09-24 11:11:38 +08:00
xiang2lin 3bddc46c9a fix:授权码接口默认设置token 2024-09-24 10:33:12 +08:00
xiang2lin 5ff781e133 feat: 企业微信接口 2024-09-24 08:56:49 +08:00
lvleigang cff92f2399 修改master依赖 2024-09-24 08:54:44 +08:00
lvleigang a778197694 修改适配钉钉单点登录 2024-09-20 15:50:29 +08:00
lvleigang 61b0cdfaee 主数据显示查看数据格式功能 2024-09-20 09:54:27 +08:00