eb090572c6 
							
						 
					 
					
						
						
							
							feat: 仓库二期,出入库单打印预览,产品范围,计价数量,换算数量  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#503 
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com> 
						
					 
					
						2024-03-26 23:09:59 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bai.jingfeng 
							
						 
					 
					
						
						
						
						
							
						
						
							6251551ded 
							
						 
					 
					
						
						
							
							fix: 修复errorBoundary ( #504 )  
						
						 
						
						... 
						
						
						
						<!-- Note -->
<!-- This is a template for submitting a new feature.
Use the bug fix template if you're submitting a bug fix pull request by adding `template=bug_fix.md` to your pull request URL. -->
# Description
<!-- Describe the new feature or modification to an existing feature clearly and consciously. -->
# Motivation
<!-- Explain the reason for adding or modifying this feature. -->
# Key changes
<!-- Provide a technically detailed description of the key changes made. -->
- Frontend
- Backend
# Test plan
## Suggestions
<!-- Provide any suggestions or recommendations for improvements in the testing plan. -->
## Underlying risk
<!-- Identify any potential risks or issues that may arise from the new feature or modification. -->
# Showcase
<!-- Including any screenshots of the new feature or modification. -->
Reviewed-on: daoyoucloud/tachycode#504 
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com> 
						
					 
					
						2024-03-26 21:50:03 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bai.jingfeng 
							
						 
					 
					
						
						
						
						
							
						
						
							f2ad0534fa 
							
						 
					 
					
						
						
							
							feat: 增加自定义组件ErrorBoundary, 以及给现有的三个自定义组件,进行错误边界处理 ( #501 )  fix   #497  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#501 
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com> 
						
					 
					
						2024-03-26 20:07:25 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
						
						
							
						
						
							b1be8381b5 
							
						 
					 
					
						
						
							
							fix(filter-form): htmlType=submit  
						
						 
						
						
						
					 
					
						2024-03-26 19:51:14 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
						
						
							
						
						
							dd0538ae04 
							
						 
					 
					
						
						
							
							chore: update changelog  
						
						 
						
						
						
					 
					
						2024-03-26 17:25:09 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
						
						
							
						
						
							339822241f 
							
						 
					 
					
						
						
							
							chore(versions):  😊  publish v0.20.0-alpha.17  
						
						 
						
						
						
					 
					
						2024-03-26 17:25:06 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								katherinehhh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							59e6b4a757 
							
						 
					 
					
						
						
							
							feat:  read pretty input number field support display format config ( #3815 )  
						
						 
						
						... 
						
						
						
						* feat: input number support display format
* feat: input number support display format
* feat: input number support display format
* feat: input number support display format
* feat: input number support display format
* feat: input number support display format
* refactor: local improve
* refactor: local improve
* refactor: code improve
* refactor: locale improve
* test: input-number
* test: input-number
* test: input-number 
						
					 
					
						2024-03-26 17:23:14 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ac5a82fde3 
							
						 
					 
					
						
						
							
							fix(Table): fix invalid pagination ( #3821 )  
						
						 
						
						... 
						
						
						
						* fix(Table): fix invalid pagination
* test: add test
* fix: unit test bug
---------
Co-authored-by: dream2023 <1098626505@qq.com> 
						
					 
					
						2024-03-26 17:15:34 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c4aa8b78c2 
							
						 
					 
					
						
						
							
							chore: add tsdoc ( #3788 )  
						
						 
						
						... 
						
						
						
						* chore: tsdoc
* chore: tsdoc
* fix: error
* chore: code format
* chore: code format 
						
					 
					
						2024-03-26 17:08:45 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Junyi 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b6ae528d80 
							
						 
					 
					
						
						
							
							chore(test): fix agent type ( #3819 )  
						
						 
						
						
						
					 
					
						2024-03-26 14:51:40 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jack zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							36372c9614 
							
						 
					 
					
						
						
							
							fix: embed plugin need hooks and e2e change ( #3727 )  
						
						 
						
						
						
					 
					
						2024-03-26 14:32:52 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e3d8a95809 
							
						 
					 
					
						
						
							
							fix(associationBlock): fix association blocks for parent collection f… ( #3813 )  
						
						 
						
						... 
						
						
						
						* fix(associationBlock): fix association blocks for parent collection fields
* test: add e2e 
						
					 
					
						2024-03-26 11:42:46 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							b690a3afd1 
							
						 
					 
					
						
						
							
							chore(e2e): update retries in defineConfig  
						
						 
						
						
						
					 
					
						2024-03-26 11:37:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Junyi 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							080e491a0d 
							
						 
					 
					
						
						
							
							fix(plugin-workflow-manual): fix schema migration ( #3814 )  
						
						 
						
						
						
					 
					
						2024-03-25 21:57:58 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							31ab773e4c 
							
						 
					 
					
						
						
							
							Merge branch '@hera/dev' of ssh://git.daoyoucloud.com:13004/daoyoucloud/tachycode into @hera/dev  
						
						 
						
						
						
					 
					
						2024-03-25 21:44:57 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bai.jingfeng 
							
						 
					 
					
						
						
						
						
							
						
						
							4a295a216f 
							
						 
					 
					
						
						
							
							feat:自定义筛选组件,优化用户输入跟踪,在筛选项顶部添加一个用户的原始输入 ( #491 )  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#491 
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com> 
						
					 
					
						2024-03-25 21:34:08 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5134a3fce0 
							
						 
					 
					
						
						
							
							Merge pull request 'fix: 修改数据表设置权限时小结出不来的问题' ( #492 ) from fix_records into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#492 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-25 21:33:53 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f3782baebd 
							
						 
					 
					
						
						
							
							fix: 修改数据表设置权限时小结出不来的问题  
						
						 
						
						
						
					 
					
						2024-03-25 21:32:18 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ca4c3e6d20 
							
						 
					 
					
						
						
							
							chore: upgrade plugin-core  
						
						 
						
						
						
					 
					
						2024-03-25 20:40:41 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							cba46cc29c 
							
						 
					 
					
						
						
							
							fix: association cascader can not filter  
						
						 
						
						
						
					 
					
						2024-03-25 20:40:08 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							80a53806bd 
							
						 
					 
					
						
						
							
							fix: association-cascader should use fieldnames  
						
						 
						
						
						
					 
					
						2024-03-25 18:25:55 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c5e0301e3d 
							
						 
					 
					
						
						
							
							chore: upgrade plugin-rental  
						
						 
						
						
						
					 
					
						2024-03-25 18:01:57 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9f23211ccd 
							
						 
					 
					
						
						
							
							fix: 优化汇总组件的金额符号根据系统语言变化 ( #488 )  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#488 
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com> 
						
					 
					
						2024-03-25 17:58:08 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							78e1aeb4f2 
							
						 
					 
					
						
						
							
							chore: upgrade plugin-core & plugin-rental  
						
						 
						
						
						
					 
					
						2024-03-25 17:57:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							629b334422 
							
						 
					 
					
						
						
							
							Merge pull request 'refactor: remove x-compoent-custom' ( #490 ) from fix_name_error into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#490  
						
					 
					
						2024-03-25 17:56:15 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6d55556254 
							
						 
					 
					
						
						
							
							Merge pull request 'fix: 产品赔偿费用无计算结果  fix   #481 ' ( #489 ) from fix_product_fee_count into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#489 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-25 17:53:44 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							301ae1e83a 
							
						 
					 
					
						
						
							
							refactor: remove x-compoent-custom  
						
						 
						
						
						
					 
					
						2024-03-25 17:49:52 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							91f273660d 
							
						 
					 
					
						
						
							
							fix: 产品赔偿费用无计算结果  fix   #481  
						
						 
						
						
						
					 
					
						2024-03-25 17:39:48 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1c32983c00 
							
						 
					 
					
						
						
							
							refactor(DataBlock): table block ( #3748 )  
						
						 
						
						... 
						
						
						
						* refactor: remove useless code
* chore: remove useless code
* feat: add createTableBlockSchema
* refactor: use createTableBlockUISchema
* refactor: extract useTableBlockParams
* refactor: extract useTableBlockSourceId
* refactor: compat
* refactor: fix typo in createTableBlockUISchema file
* refactor: should not get collection on getting association in UISchema
* refactor: use x-use-component-props instead of useProps
* chore: fix unit tests
* fix: fix errors
* refactor: refactor data block source ID hooks 
						
					 
					
						2024-03-25 17:35:57 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							aa2542b706 
							
						 
					 
					
						
						
							
							fix: 优化自定义筛选组件和逻辑 ( #486 )  
						
						 
						
						... 
						
						
						
						<!-- Note -->
<!-- This is a template for submitting a new feature.
Use the bug fix template if you're submitting a bug fix pull request by adding `template=bug_fix.md` to your pull request URL. -->
# Description
<!-- Describe the new feature or modification to an existing feature clearly and consciously. -->
# Motivation
<!-- Explain the reason for adding or modifying this feature. -->
# Key changes
<!-- Provide a technically detailed description of the key changes made. -->
- Frontend
- Backend
# Test plan
## Suggestions
<!-- Provide any suggestions or recommendations for improvements in the testing plan. -->
## Underlying risk
<!-- Identify any potential risks or issues that may arise from the new feature or modification. -->
# Showcase
<!-- Including any screenshots of the new feature or modification. -->
Co-authored-by: sealday <sealday@gmail.com>
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Reviewed-on: daoyoucloud/tachycode#486 
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com> 
						
					 
					
						2024-03-25 17:24:21 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							610fee7035 
							
						 
					 
					
						
						
							
							fix: 修改合同编号为合同编码 ( #483 )  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#483 
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com> 
						
					 
					
						2024-03-25 17:21:22 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0269a1ff7d 
							
						 
					 
					
						
						
							
							fix(Details): block template ( #3807 )  
						
						 
						
						... 
						
						
						
						* fix: add 'Details' in condition
* fix: block template 
						
					 
					
						2024-03-25 16:25:41 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ChengLei Shao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2195a31f5b 
							
						 
					 
					
						
						
							
							chore: cascade can replace set null action ( #3812 )  
						
						 
						
						
						
					 
					
						2024-03-25 16:02:52 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								YANG QIA 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							088f3977a2 
							
						 
					 
					
						
						
							
							feat(data-vi): support multiple data sources ( #3743 )  
						
						 
						
						... 
						
						
						
						* feat(data-vi): support multiple data sources
* chore: update
* chore: new pr
* chore: update
* chore: merge
* fix: bug
* fix: isDBInstance
* fix: fix T-3624
* fix: fix T-3625
* fix: test
* fix: fix T-3659
* fix: fix T-3660
* fix: backend tests
* fix: acl
* fix: fix T-3680
* fix: build 
						
					 
					
						2024-03-25 14:54:13 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Junyi 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d691e4c7e6 
							
						 
					 
					
						
						
							
							feat(plugin-workflow): support multiple data source in workflow ( #3739 )  
						
						 
						
						... 
						
						
						
						* feat(plugin-workflow): support multiple data source in workflow
* fix(plugin-workflow): fix test cases
* test(plugin-workflow-sql): debug test case
* fix(plugin-workflow): fix collection trigger creation without config
* test(plugin-workflow-sql): debug test case
* fix: workflow e2e test
* chore(ci): disable console intercept in vitest
* chore(ci): disable console intercept in vitest
* chore(ci): disable console intercept in vitest
* chore(ci): disable console intercept in vitest
* test(plugin-workflow-sql): debug test case
* test: approval e2e
* fix: remove pro-plugins from packages
* refactor(plugin-workflow): support pass collection from props to CollectionBlockInitializer
* test(plugin-workflow): add test case
* fix(plugin-workflow): disable modification of executed workflow
* fix: e2ePageObjectModel
* fix: load data source when data source load failed (#3793 )
* chore: console.log
* fix(subTable): fix sorting rule setting (#3795 )
* fix: through collection support search (#3800 )
* fix(client): visible -> useVisible
* fix(client): fix action designer error occured in custom form (#3801 )
* fix(client): fix action designer error occured in custom form
* fix(client): fix from the source
* chore(module): remove submodule
* fix(plugin-workflow): fix client cycling import
* fix(plugin-workflow): fix collection event name
* fix(plugin-workflow): fix undefined ref
---------
Co-authored-by: hongboji <j414562100@qq.com>
Co-authored-by: ChengLei Shao <chareice@live.com>
Co-authored-by: Zeke Zhang <958414905@qq.com>
Co-authored-by: katherinehhh <shunai.tang@hand-china.com>
Co-authored-by: chenos <chenlinxh@gmail.com> 
						
					 
					
						2024-03-25 14:46:22 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f2828cd8b0 
							
						 
					 
					
						
						
							
							chore: add options for matching and ignoring test files in e2e and p-test commands ( #3811 )  
						
						 
						
						
						
					 
					
						2024-03-25 12:29:44 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								katherinehhh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5e22103e33 
							
						 
					 
					
						
						
							
							chore: file collection template preset fields should be disabled ( #3810 )  
						
						 
						
						
						
					 
					
						2024-03-25 11:39:52 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Junyi 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e9e116e476 
							
						 
					 
					
						
						
							
							fix(plugin-workflow): remove string template in condition calculation ( #3688 )  
						
						 
						
						
						
					 
					
						2024-03-25 11:34:14 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jack zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							00cf5fa02c 
							
						 
					 
					
						
						
							
							fix: refresh collection name when update ( #3797 )  
						
						 
						
						
						
					 
					
						2024-03-25 11:30:38 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jack zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							570e5c1354 
							
						 
					 
					
						
						
							
							fix: reload when data source click refresh ( #3804 )  
						
						 
						
						
						
					 
					
						2024-03-25 11:28:54 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								katherinehhh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							66229cc92b 
							
						 
					 
					
						
						
							
							fix: plugin manager keywords ( #3809 )  
						
						 
						
						
						
					 
					
						2024-03-25 09:51:57 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
						
						
							
						
						
							0dc0d329f8 
							
						 
					 
					
						
						
							
							fix: description  
						
						 
						
						
						
					 
					
						2024-03-25 09:48:08 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
						
						
							
						
						
							aa6e753b35 
							
						 
					 
					
						
						
							
							fix: update the locale file requires a reboot  
						
						 
						
						
						
					 
					
						2024-03-25 09:46:45 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								katherinehhh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							88d1bdbefb 
							
						 
					 
					
						
						
							
							fix: expand action and add new action should support drag & sort ( #3808 )  
						
						 
						
						
						
					 
					
						2024-03-24 19:44:39 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ChengLei Shao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e410dece22 
							
						 
					 
					
						
						
							
							fix: create attachments middleware ( #3794 )  
						
						 
						
						
						
					 
					
						2024-03-24 19:08:53 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							921696f40b 
							
						 
					 
					
						
						
							
							fix: useExpressionScope ( #3805 )  
						
						 
						
						
						
					 
					
						2024-03-24 12:51:41 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ChengLei Shao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5ee278557d 
							
						 
					 
					
						
						
							
							chore: set default association reference on delete action to no action ( #3722 )  
						
						 
						
						... 
						
						
						
						* chore: tmp commit
* chore: build association reference
* fix: test 
						
					 
					
						2024-03-24 09:37:52 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1bf79e6a58 
							
						 
					 
					
						
						
							
							Merge pull request 'merge_from_origin' ( #474 ) from merge_from_origin into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#474  
						
					 
					
						2024-03-24 01:04:09 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							0249affd47 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/main' into merge_from_origin  
						
						 
						
						
						
					 
					
						2024-03-24 01:03:26 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							2ddbe8e596 
							
						 
					 
					
						
						
							
							fix: pdf双列备注信息展示重复 ( #471 )  fix   #472  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#471 
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com> 
						
					 
					
						2024-03-23 22:29:03 +08:00