| 
						
					 | 
					
						
						
							
						
						05e9e77b6b
					 | 
					
						
						
							
							Merge pull request '2023/8/24新增修改下架包装页面' (#31) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #31 
						
						
					 | 
					
						2023-08-24 11:01:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa8d94a21f
					 | 
					
						
						
							
							2023/8/24新增修改下架包装页面
						
						
						
						
						
						
					 | 
					
						2023-08-24 10:57:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebef126a9e
					 | 
					
						
						
							
							Merge pull request 'zjl' (#30) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #30 
						
						
					 | 
					
						2023-08-11 16:03:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						15126dea99
					 | 
					
						
						
							
							表格渲染输入框&散点图的问题
						
						
						
						
						
						
					 | 
					
						2023-08-11 16:01:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b633a703a
					 | 
					
						
						
							
							报表列表样式
						
						
						
						
						
						
					 | 
					
						2023-08-02 15:57:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2304fe94ae
					 | 
					
						
						
							
							Merge pull request 'zjl' (#29) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #29 
						
						
					 | 
					
						2023-07-19 15:47:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8afbef1297
					 | 
					
						
						
							
							后工程日报表
						
						
						
						
						
						
					 | 
					
						2023-07-19 15:45:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						37518be002
					 | 
					
						
						
							
							7.13
						
						
						
						
						
						
					 | 
					
						2023-07-13 14:11:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ceb47038d
					 | 
					
						
						
							
							Merge pull request '工单进度' (#28) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #28 
						
						
					 | 
					
						2023-07-05 16:46:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						58bc2d3682
					 | 
					
						
						
							
							工单进度
						
						
						
						
						
						
					 | 
					
						2023-07-05 16:45:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ea9fad130c
					 | 
					
						
						
							
							Merge pull request '7.4修改bug' (#27) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #27 
						
						
					 | 
					
						2023-07-04 09:26:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						06f7b29270
					 | 
					
						
						
							
							7.4修改bug
						
						
						
						
						
						
					 | 
					
						2023-07-04 09:21:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4956f4e0cd
					 | 
					
						
						
							
							Merge pull request 'zjl' (#26) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #26 
						
						
					 | 
					
						2023-06-30 14:01:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						477ea44b7d
					 | 
					
						
						
							
							6-30-2
						
						
						
						
						
						
					 | 
					
						2023-06-30 14:01:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						858812b964
					 | 
					
						
						
							
							6.30
						
						
						
						
						
						
					 | 
					
						2023-06-30 13:56:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						42ce5fb67c
					 | 
					
						
						
							
							Merge pull request '6.28' (#25) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #25 
						
						
					 | 
					
						2023-06-28 17:06:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e2af05e78
					 | 
					
						
						
							
							6.28
						
						
						
						
						
						
					 | 
					
						2023-06-28 17:05:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b054cd476a
					 | 
					
						
						
							
							Merge pull request '报表样式修改' (#24) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #24 
						
						
					 | 
					
						2023-06-26 16:04:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a11ef7da48
					 | 
					
						
						
							
							报表样式修改
						
						
						
						
						
						
					 | 
					
						2023-06-26 16:03:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dc4e1fd389
					 | 
					
						
						
							
							Merge pull request 'zjl' (#23) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #23 
						
						
					 | 
					
						2023-06-16 16:25:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0aa208aa0b
					 | 
					
						
						
							
							生产数据
						
						
						
						
						
						
					 | 
					
						2023-06-16 16:19:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8164b2d677
					 | 
					
						
						
							
							上传dist
						
						
						
						
						
						
					 | 
					
						2023-06-13 14:08:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d5f1100dd9
					 | 
					
						
						
							
							6.13
						
						
						
						
						
						
					 | 
					
						2023-06-13 14:04:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6d64016d57
					 | 
					
						
						
							
							Merge pull request '增加报表管理模块' (#22) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #22 
						
						
					 | 
					
						2023-05-30 09:05:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						de0a6c45e0
					 | 
					
						
						
							
							增加报表管理模块
						
						
						
						
						
						
					 | 
					
						2023-05-30 09:00:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1e06c04ddd
					 | 
					
						
						
							
							Merge pull request '5.25' (#21) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #21 
						
						
					 | 
					
						2023-05-25 15:16:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ae3d3f3e7
					 | 
					
						
						
							
							5.25
						
						
						
						
						
						
					 | 
					
						2023-05-25 15:16:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						37188fe760
					 | 
					
						
						
							
							Merge pull request '5.24' (#20) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #20 
						
						
					 | 
					
						2023-05-24 10:37:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f3e296f6e6
					 | 
					
						
						
							
							5.24
						
						
						
						
						
						
					 | 
					
						2023-05-24 10:37:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dead1e5a40
					 | 
					
						
						
							
							Merge pull request '5.22' (#19) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #19 
						
						
					 | 
					
						2023-05-22 14:21:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						997c8c86eb
					 | 
					
						
						
							
							5.22
						
						
						
						
						
						
					 | 
					
						2023-05-22 14:21:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9c6bf70008
					 | 
					
						
						
							
							Merge pull request '5.18' (#18) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #18 
						
						
					 | 
					
						2023-05-18 11:14:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						61d55ac797
					 | 
					
						
						
							
							5.18
						
						
						
						
						
						
					 | 
					
						2023-05-18 11:14:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						194b2f0e0d
					 | 
					
						
						
							
							Merge pull request '修bug' (#17) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #17 
						
						
					 | 
					
						2023-05-16 16:14:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						948cc07a9c
					 | 
					
						
						
							
							修bug
						
						
						
						
						
						
					 | 
					
						2023-05-16 16:13:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						34d7b8682d
					 | 
					
						
						
							
							Merge pull request '修改bug' (#16) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #16 
						
						
					 | 
					
						2023-05-15 17:25:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7067aaa2df
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2023-05-15 17:25:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f8f692852
					 | 
					
						
						
							
							Merge pull request 'zjl' (#15) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #15 
						
						
					 | 
					
						2023-05-04 16:20:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da452fe43a
					 | 
					
						
						
							
							dist
						
						
						
						
						
						
					 | 
					
						2023-05-04 16:20:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9613c361be
					 | 
					
						
						
							
							基板报表&厚度汇总报表
						
						
						
						
						
						
					 | 
					
						2023-05-04 16:15:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						65beb245d6
					 | 
					
						
						
							
							4.26
						
						
						
						
						
						
					 | 
					
						2023-04-26 15:27:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c75999ea93
					 | 
					
						
						
							
							Merge pull request '报表模块小问题' (#14) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #14 
						
						
					 | 
					
						2023-03-23 15:50:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae530033e3
					 | 
					
						
						
							
							报表模块小问题
						
						
						
						
						
						
					 | 
					
						2023-03-23 15:50:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						76b88ed75a
					 | 
					
						
						
							
							Merge pull request '报表模块' (#13) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #13 
						
						
					 | 
					
						2023-03-23 15:40:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8060214000
					 | 
					
						
						
							
							报表模块
						
						
						
						
						
						
					 | 
					
						2023-03-23 15:40:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a7b39f3ce1
					 | 
					
						
						
							
							Merge pull request 'fix: 🐛 修正构建脚本' (#12) from cicd into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #12 
						
						
					 | 
					
						2023-03-14 14:39:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8dc73bd098
					 | 
					
						
						
							
							fix: 🐛 修正构建脚本
						
						
						
						
						
						
					 | 
					
						2023-03-14 14:38:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						523a9d9767
					 | 
					
						
						
							
							Merge pull request 'zjl' (#11) from zjl into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #11 
						
						
					 | 
					
						2023-03-14 14:15:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b9428e6a89
					 | 
					
						
						
							
							颗粒折线图
						
						
						
						
						
						
					 | 
					
						2023-03-14 14:14:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d9da687efd
					 | 
					
						
						
							
							缺陷散点图
						
						
						
						
						
						
					 | 
					
						2023-03-10 16:55:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |