|
|
094da396c1
|
Merge remote-tracking branch 'origin/main'
|
2026-02-09 21:46:21 +08:00 |
|
|
|
d9a621d6a7
|
转场数据分离bug修复
|
2026-02-09 21:46:12 +08:00 |
|
|
|
7bce9a0774
|
Merge remote-tracking branch 'origin/main'
|
2026-02-09 20:25:03 +08:00 |
|
|
|
5cf769c9f5
|
生物安全是否在群，以及execl导出枚举
|
2026-02-09 20:24:51 +08:00 |
|
|
|
fb80399602
|
bug修复以及数据分离操作
|
2026-02-09 20:22:51 +08:00 |
|
|
|
7dbe337a93
|
班次奶量和羊奶出入库bug修改
|
2026-02-08 22:10:33 +08:00 |
|
|
|
591b6d537f
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScWeanRecordController.java
|
2026-02-07 14:36:09 +08:00 |
|
|
|
928fe4d9bc
|
bug修改
|
2026-02-07 14:35:36 +08:00 |
|
|
|
4ddc661987
|
Merge remote-tracking branch 'origin/main'
|
2026-02-05 21:57:23 +08:00 |
|
|
|
7cc0f806ba
|
销售管理数据分离修改
|
2026-02-05 21:56:49 +08:00 |
|
|
|
de244cc1d3
|
Merge remote-tracking branch 'origin/main'
|
2026-02-05 14:17:49 +08:00 |
|
|
|
6e575fdd21
|
修改羊舍管理页面，完善导出功能，按照需求导出表格
|
2026-02-05 14:17:34 +08:00 |
|
|
|
51d1c5d145
|
羊只档案查询修改
|
2026-02-04 17:35:48 +08:00 |
|
|
|
fd16c66412
|
Merge remote-tracking branch 'origin/main'
|
2026-02-03 22:22:33 +08:00 |
|
|
|
68ea3b2721
|
断奶bug修改
|
2026-02-03 22:22:21 +08:00 |
|
|
|
2c17d04b7a
|
Merge remote-tracking branch 'origin/main'
|
2026-02-03 22:15:05 +08:00 |
|
|
|
9ed2039df0
|
耳号验证修改批量验证
|
2026-02-03 22:14:57 +08:00 |
|
|
|
57b5415405
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScDryMilkController.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScSheepDeathController.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScSheepDeath.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScDryMilkMapper.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScSheepDeathMapper.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScWeanRecordMapper.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScDryMilkService.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScSheepDeathService.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScWeanRecordService.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScDryMilkServiceImpl.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScSheepDeathServiceImpl.java
# zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScWeanRecordServiceImpl.java
# zhyc-module/src/main/resources/mapper/produce/breed/ScDryMilkMapper.xml
# zhyc-module/src/main/resources/mapper/produce/breed/ScSheepDeathMapper.xml
|
2026-02-03 21:54:19 +08:00 |
|
|
|
e233d50b56
|
Merge remote-tracking branch 'origin/main'
|
2026-02-03 18:06:33 +08:00 |
|
|
|
72a671fac2
|
修改羊舍管理页面，完善删除、导出功能
|
2026-02-03 18:06:00 +08:00 |
|
zyk
|
f138074f70
|
Merge remote-tracking branch 'origin/main'
|
2026-02-03 14:44:08 +08:00 |
|
zyk
|
163cf5e578
|
孕检界面逻辑修复完成
|
2026-02-03 14:44:02 +08:00 |
|
|
|
504a6a6203
|
Merge remote-tracking branch 'origin/main'
|
2026-02-03 14:41:44 +08:00 |
|
|
|
2f6a1a9600
|
转场，转群，改耳号，改备注，改品种部分bug修复，字段顺序调整
|
2026-02-03 14:41:28 +08:00 |
|
zyk
|
5436cb1071
|
Merge remote-tracking branch 'origin/main'
|
2026-02-02 16:51:24 +08:00 |
|
zyk
|
7b3f879198
|
配种记录和冲胚记录所有逻辑修改完成
|
2026-02-02 16:51:15 +08:00 |
|
|
|
4c6d3f1c49
|
修改羊舍页面
|
2026-02-02 16:22:49 +08:00 |
|
|
|
21eedb8508
|
Merge remote-tracking branch 'origin/main'
|
2026-02-02 16:19:49 +08:00 |
|
|
|
fa65442f58
|
修改羊舍页面
|
2026-02-02 16:19:36 +08:00 |
|
|
|
52a61c0567
|
奶品管理数据分离修改
|
2026-02-02 13:51:55 +08:00 |
|
|
|
4ab62cd1f2
|
fix(produce/breed): 接口未实现 | 合并错误
produce模块中未实现接口问题(仅使用默认实现代替)
|
2026-02-02 12:31:08 +08:00 |
|
zyk
|
2f0e80868e
|
配种计划页面修复，功能加强
|
2026-02-02 07:48:32 +08:00 |
|
|
|
b47aa9b269
|
干奶录入查询问题
|
2026-02-02 00:04:33 +08:00 |
|
|
|
5a2f59b02d
|
fix(produce/breed): 接口未实现
produce模块中未实现接口问题(仅使用默认实现代替)
|
2026-02-01 21:52:14 +08:00 |
|
|
|
40fc60ddc9
|
refactor(feed/all): 数据库增加字段支持
为数据库中新增的`user_id` `dept_id` 提供结构支持
[重构依据](https://www.yuque.com/piaobo-igrka/xvqmhp/ofcoxh57lywwubgy?singleDoc#)
BREAKING CHANGE: 可能产生隐性数据一致性问题
可能导致某些业务逻辑出现问题
|
2026-02-01 21:49:42 +08:00 |
|
|
|
464126195d
|
断奶录入问题，断奶查询问题，干奶录入问题，干奶查询问题，死亡录入问题，死亡查询问题
|
2026-02-01 21:47:56 +08:00 |
|
zyk
|
8f9944d069
|
Merge remote-tracking branch 'origin/main'
|
2026-02-01 09:58:57 +08:00 |
|
zyk
|
1736b51fea
|
配种计划最终完善，产羔页面bug修复
|
2026-02-01 09:58:49 +08:00 |
|
|
|
f0acd149c7
|
牧场跟跟部门绑定
|
2026-01-30 15:50:23 +08:00 |
|
|
|
086cb43359
|
根据岗位编号查询用户，以及生物安全模块的数据分离userId，deptId字段新增修改
|
2026-01-29 23:28:24 +08:00 |
|
|
|
c9cefa3d33
|
生物安全多羊只耳号查询
|
2026-01-27 23:40:51 +08:00 |
|
|
|
62947ca5e8
|
Merge remote-tracking branch 'origin/main'
|
2026-01-27 15:36:24 +08:00 |
|
|
|
7890c4d792
|
修改
|
2026-01-27 15:36:01 +08:00 |
|
zyk
|
219ac30e28
|
Merge remote-tracking branch 'origin/main'
|
2026-01-27 15:19:48 +08:00 |
|
zyk
|
ced5b0b09a
|
繁育多个页面的多耳号输入
|
2026-01-27 15:19:38 +08:00 |
|
|
|
5bcfadfd85
|
Merge remote-tracking branch 'origin/main'
|
2026-01-22 19:59:01 +08:00 |
|
|
|
02b8eefc8d
|
app后端接口，生物安全查询修改
|
2026-01-22 19:58:46 +08:00 |
|
|
|
899b74ef27
|
Merge remote-tracking branch 'origin/main'
|
2026-01-20 16:14:47 +08:00 |
|
|
|
25cef5dd15
|
冻胚冻精不同状态添加区分标识，新增根据状态搜索
|
2026-01-20 16:14:38 +08:00 |
|
|
|
13e0f68289
|
Merge remote-tracking branch 'origin/main'
|
2026-01-19 20:43:37 +08:00 |
|
