wangpeng/casic-metering

Fork: 0

wangpeng / casic-metering

History for casic-metering / casic-metering-service / src / main / java

2023-03-14	8c26ba8 Browse files » 已取消实例再次提交，原有实例处理 wangpeng committed on 14 Mar 2023
	afa2957 Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev chaizhuang committed on 14 Mar 2023
	747322f Browse files » 由于证书打印从证书报告拆分出新的表格，现对以下接口进行了变更 ... 1、证书打印列表 2、证书打印相关审批 3、证书打印详情页面 4、证书报告审批通过，生成证书打印 chaizhuang committed on 14 Mar 2023
	8ee1217 Browse files » 联调 wangpeng committed on 14 Mar 2023
	9898551 Browse files » 联调 wangpeng committed on 14 Mar 2023
	f39ec74 Browse files » 联调 wangpeng committed on 14 Mar 2023
	a3dc7d4 Browse files » Merge remote-tracking branch 'origin/dev' into dev xiezhuangz committed on 14 Mar 2023
	715708b Browse files » 价格库测试bug修改 xiezhuangz committed on 14 Mar 2023
2023-03-13	8be500a Browse files » 培训计划增加APP端查询参数 wangpeng committed on 13 Mar 2023
	a684e2e Browse files » Merge remote-tracking branch 'origin/dev' into dev xiezhuangz committed on 13 Mar 2023
	9dc6aa3 Browse files » 测试bug修改 xiezhuangz committed on 13 Mar 2023
	bc231c2 Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev chaizhuang committed on 13 Mar 2023
	70c5c2b Browse files » 1、实验室状态bug ... 2、委托书新增样品，缺少委托方编号 3、证书打印证书工具通用性修改 chaizhuang committed on 13 Mar 2023
	6e9e255 Browse files » 任务分发-部门负责人分配功能 wangpeng committed on 13 Mar 2023
	fa8b07d Browse files » 任务分发-部门负责人分配功能 wangpeng committed on 13 Mar 2023
	8b6c0d7 Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev casic_zt committed on 13 Mar 2023
	934b445 Browse files » 证书报告审批通过后更新样品有效期 casic_zt committed on 13 Mar 2023
	7bdf86f Browse files » Merge remote-tracking branch 'origin/dev' into dev xiezhuangz committed on 13 Mar 2023
	a199d78 Browse files » 通过名字/编号查询设备与样品,测试bug修改 xiezhuangz committed on 13 Mar 2023
2023-03-10	dd140a0 Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev chaizhuang committed on 10 Mar 2023
	204470b Browse files » 1、设备收发新增状态完成状态后置实验室处理 ... 2、新增编号前缀查询功能 3、新增设备收发消息催办 4、其他bug修复 chaizhuang committed on 10 Mar 2023
	d1aaf9f Browse files » 联调 wangpeng committed on 10 Mar 2023
	f352220 Browse files » 证书接口联调问题修改提交 casic_zt committed on 10 Mar 2023
	d9fde1e Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev ... Conflicts: casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java casic_zt committed on 10 Mar 2023
	ae560ef Browse files » 证书接口提交 casic_zt committed on 10 Mar 2023
	f177e70 Browse files » 1、根据客户id、样品id查询证书列表修改未知 ... 2、变更 chaizhuang committed on 10 Mar 2023
	0dc992c Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev ... Conflicts: casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java casic_zt committed on 10 Mar 2023
	fde845e Browse files » 拉代码 casic_zt committed on 10 Mar 2023
	0690d4a Browse files » Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev chaizhuang committed on 10 Mar 2023
	500b433 Browse files » 业务调度模块bug修改 chaizhuang committed on 10 Mar 2023