init db v4.1.8

2019-12-18 23:24:14 +08:00
parent aedbb33fd8
commit 262291588c
17 changed files with 103 additions and 39 deletions
--- a/modules/core/db/core.erm
+++ b/modules/core/db/core.erm
@@ -12,7 +12,7 @@
 	<category_index>0</category_index>
 	<zoom>1.0</zoom>
 	<x>18</x>
-	<y>396</y>
+	<y>431</y>
 	<default_color>
 		<r>128</r>
 		<g>128</g>
@@ -41,10 +41,10 @@
 		<suspend_validator>false</suspend_validator>
 		<export_setting>
 			<export_ddl_setting>
-				<output_path>db\mysql\core.sql</output_path>
+				<output_path>db\core.sql</output_path>
 				<encoding>UTF-8</encoding>
 				<line_feed>CR+LF</line_feed>
-				<is_open_after_saved>false</is_open_after_saved>
+				<is_open_after_saved>true</is_open_after_saved>
 				<environment_id>7be191506f9daa8070b3ac14921dffd44063d2bb</environment_id>
 				<category_id>null</category_id>
 				<ddl_target>
@@ -89,7 +89,7 @@
 				<is_open_after_saved>true</is_open_after_saved>
 			</export_html_setting>
 			<export_image_setting>
-				<output_file_path>db\module_core.png</output_file_path>
+				<output_file_path>db\core.png</output_file_path>
 				<category_dir_path></category_dir_path>
 				<with_category_image>true</with_category_image>
 				<is_open_after_saved>true</is_open_after_saved>
@@ -1032,7 +1032,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>8e6503837a4993eab7dd018391909b3a9185f0bd</id>
+			<id>46d0f56aace23d853693d4e581e9904d463b8860</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1043,10 +1043,26 @@
 			<args></args>
 			<char_semantics>false</char_semantics>
 			<description>英文名</description>
-			<logical_name>英文名</logical_name>
+			<logical_name>员工英文名</logical_name>
 			<physical_name>emp_name_en</physical_name>
 			<type>varchar(n)</type>
 		</word>
+		<word>
+			<id>c3398bbf1c346a338db14449fcb9fa2f6c70f372</id>
+			<length>100</length>
+			<decimal>null</decimal>
+			<array>false</array>
+			<array_dimension>null</array_dimension>
+			<unsigned>false</unsigned>
+			<zerofill>false</zerofill>
+			<binary>false</binary>
+			<args></args>
+			<char_semantics>false</char_semantics>
+			<description></description>
+			<logical_name>员工工号</logical_name>
+			<physical_name>emp_no</physical_name>
+			<type>nvarchar(n)</type>
+		</word>
 		<word>
 			<id>d903f31236ff7a6701ff92a19986146ace84c236</id>
 			<length>null</length>
@@ -4388,7 +4404,7 @@
 			</color>
 			<connections>
 				<relation>
-					<id>8a72200fa40d6b695965f7394412ff219269f8bd</id>
+					<id>a94020550e7bc4d31384f96700f2c31721d49880</id>
 					<source>26e4b2554a744e584fba5f3b88c267026359e727</source>
 					<target>54d156398db07de97741ea8035283f424eae82dc</target>
 						<source_xp>-1</source_xp>
@@ -4442,7 +4458,7 @@
 				<normal_column>
 					<id>2f7bbb8699e51f6ae50ccbab765f8de4a402cad2</id>
 					<referenced_column>ab8b402ea35a78cdadd5ed446d571c9a80b532ee</referenced_column>
-					<relation>8a72200fa40d6b695965f7394412ff219269f8bd</relation>
+					<relation>a94020550e7bc4d31384f96700f2c31721d49880</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -7129,7 +7145,7 @@
 			</color>
 			<connections>
 				<relation>
-					<id>968d12779004284e9a5086a1c15b2b1b5c25da4c</id>
+					<id>9a24a5fe2b90473016e496df5121ad7b1f2cfe4c</id>
 					<source>26e4b2554a744e584fba5f3b88c267026359e727</source>
 					<target>0ded13a505cc3bfde24edfbae369231be192a59b</target>
 						<source_xp>-1</source_xp>
@@ -7590,7 +7606,7 @@
 				<normal_column>
 					<id>f22a1cfec76101d87da3a951bb05d7700418c1c1</id>
 					<referenced_column>ab8b402ea35a78cdadd5ed446d571c9a80b532ee</referenced_column>
-					<relation>968d12779004284e9a5086a1c15b2b1b5c25da4c</relation>
+					<relation>9a24a5fe2b90473016e496df5121ad7b1f2cfe4c</relation>
 					<description>用户类型引用编号，例如如：当user_type为1员工的时候，ref_code关联的为emp_code</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>用户类型引用编号</logical_name>
@@ -12585,7 +12601,7 @@
 				<inidex>
 					<full_text>false</full_text>
 					<non_unique>true</non_unique>
-					<name>idx_sys_msg_inner_r_status</name>
+					<name>idx_sys_msg_inner_r_stat</name>
 					<type></type>
 					<description></description>
 					<columns>
@@ -14751,7 +14767,7 @@
 			</color>
 			<connections>
 				<relation>
-					<id>f50781f370e11ee22b60c8cbf3ee46fe3d31592b</id>
+					<id>5c633b8026bdc419fe015e88d5a2e8c2622e7f1c</id>
 					<source>26e4b2554a744e584fba5f3b88c267026359e727</source>
 					<target>f151f987251ae4e9949b5ed48822458897360e0b</target>
 						<source_xp>-1</source_xp>
@@ -14860,7 +14876,7 @@
 				<normal_column>
 					<id>5eed2939e1d63782c6ef3363e98724114c4a5f6a</id>
 					<referenced_column>ab8b402ea35a78cdadd5ed446d571c9a80b532ee</referenced_column>
-					<relation>f50781f370e11ee22b60c8cbf3ee46fe3d31592b</relation>
+					<relation>5c633b8026bdc419fe015e88d5a2e8c2622e7f1c</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -16303,7 +16319,7 @@
 			</color>
 			<connections>
 				<relation>
-					<id>dc62d8a8ae47139bde65fdea22fb08ec869cb5ba</id>
+					<id>45922c254c3b94aa89bf37d0dd2f3c7665aabcc2</id>
 					<source>e358008a1c9b84f744e89039339ba56765fe34bd</source>
 					<target>26e4b2554a744e584fba5f3b88c267026359e727</target>
 						<source_xp>-1</source_xp>
@@ -16325,7 +16341,7 @@
 					<referenced_complex_unique_key>null</referenced_complex_unique_key>
 				</relation>
 				<relation>
-					<id>a879d42851b5e1de227ec1be77e5e9829bf3e554</id>
+					<id>1f685cf44fc37577bc9d75f175ec6820d986117b</id>
 					<source>f24ec280de439487a7e35a62e11a445e7adbd9b6</source>
 					<target>26e4b2554a744e584fba5f3b88c267026359e727</target>
 						<source_xp>-1</source_xp>
@@ -16421,7 +16437,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>8e6503837a4993eab7dd018391909b3a9185f0bd</word_id>
+					<word_id>46d0f56aace23d853693d4e581e9904d463b8860</word_id>
 					<id>28440c39441334f1eacbfa49440ebfc746edbada</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -16453,10 +16469,43 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
+				<normal_column>
+					<word_id>c3398bbf1c346a338db14449fcb9fa2f6c70f372</word_id>
+					<id>d46df317a3e234d6fa23d149f1b0e61126beaf92</id>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>nvarchar(n)</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>false</auto_increment>
+					<foreign_key>false</foreign_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<nocache>false</nocache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
 				<normal_column>
 					<id>b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c</id>
 					<referenced_column>512f24dbe486a211117dfb58e689ef3e0e5009a0</referenced_column>
-					<relation>a879d42851b5e1de227ec1be77e5e9829bf3e554</relation>
+					<relation>1f685cf44fc37577bc9d75f175ec6820d986117b</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -16523,7 +16572,7 @@
 				<normal_column>
 					<id>76ab6ac096fb9c9be7bf61df683ce21a3da0c33d</id>
 					<referenced_column>5ac7f3a7a755a58e6119c8d4922df644559e632f</referenced_column>
-					<relation>dc62d8a8ae47139bde65fdea22fb08ec869cb5ba</relation>
+					<relation>45922c254c3b94aa89bf37d0dd2f3c7665aabcc2</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
--- a/modules/core/db/db2/core.sql
+++ b/modules/core/db/db2/core.sql
@@ -261,6 +261,7 @@ CREATE TABLE js_sys_employee
 	emp_code varchar(64) NOT NULL,
 	emp_name vargraphic(100) NOT NULL,
 	emp_name_en varchar(100),
+	emp_no vargraphic(100),
 	office_code varchar(64) NOT NULL,
 	office_name vargraphic(100) NOT NULL,
 	company_code varchar(64),
@@ -898,7 +899,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code);
 CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date);
 CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id);
 CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code);
-CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status);
+CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status);
 CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star);
 CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type);
 CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code);
--- a/modules/core/db/h2/core.sql
+++ b/modules/core/db/h2/core.sql
@@ -261,6 +261,7 @@ CREATE TABLE js_sys_employee
 	emp_code varchar(64) NOT NULL,
 	emp_name varchar(100) NOT NULL,
 	emp_name_en varchar(100),
+	emp_no varchar(100),
 	office_code varchar(64) NOT NULL,
 	office_name varchar(100) NOT NULL,
 	company_code varchar(64),
@@ -898,7 +899,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code);
 CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date);
 CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id);
 CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code);
-CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status);
+CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status);
 CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star);
 CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type);
 CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code);
--- a/modules/core/db/mssql/core.sql
+++ b/modules/core/db/mssql/core.sql
@@ -261,6 +261,7 @@ CREATE TABLE [js_sys_employee]
 	[emp_code] varchar(64) NOT NULL,
 	[emp_name] nvarchar(100) NOT NULL,
 	[emp_name_en] varchar(100),
+	[emp_no] nvarchar(100),
 	[office_code] varchar(64) NOT NULL,
 	[office_name] nvarchar(100) NOT NULL,
 	[company_code] varchar(64),
@@ -898,7 +899,7 @@ CREATE INDEX [idx_sys_msg_inner_sc] ON [js_sys_msg_inner] ([send_user_code]);
 CREATE INDEX [idx_sys_msg_inner_sd] ON [js_sys_msg_inner] ([send_date]);
 CREATE INDEX [idx_sys_msg_inner_r_mi] ON [js_sys_msg_inner_record] ([msg_inner_id]);
 CREATE INDEX [idx_sys_msg_inner_r_ruc] ON [js_sys_msg_inner_record] ([receive_user_code]);
-CREATE INDEX [idx_sys_msg_inner_r_status] ON [js_sys_msg_inner_record] ([read_status]);
+CREATE INDEX [idx_sys_msg_inner_r_stat] ON [js_sys_msg_inner_record] ([read_status]);
 CREATE INDEX [idx_sys_msg_inner_r_star] ON [js_sys_msg_inner_record] ([is_star]);
 CREATE INDEX [idx_sys_msg_push_type] ON [js_sys_msg_push] ([msg_type]);
 CREATE INDEX [idx_sys_msg_push_rc] ON [js_sys_msg_push] ([receive_code]);
--- a/modules/core/db/mysql/core.sql
+++ b/modules/core/db/mysql/core.sql
@@ -261,7 +261,8 @@ CREATE TABLE js_sys_employee
 (
 	emp_code varchar(64) NOT NULL COMMENT '员工编码',
 	emp_name varchar(100) NOT NULL COMMENT '员工姓名',
-	emp_name_en varchar(100) COMMENT '英文名',
+	emp_name_en varchar(100) COMMENT '员工英文名',
+	emp_no varchar(100) COMMENT '员工工号',
 	office_code varchar(64) NOT NULL COMMENT '机构编码',
 	office_name varchar(100) NOT NULL COMMENT '机构名称',
 	company_code varchar(64) COMMENT '公司编码',
@@ -899,7 +900,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code ASC);
 CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date ASC);
 CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id ASC);
 CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code ASC);
-CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status ASC);
+CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status ASC);
 CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star ASC);
 CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type ASC);
 CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code ASC);
--- a/modules/core/db/oracle/core.sql
+++ b/modules/core/db/oracle/core.sql
@@ -261,6 +261,7 @@ CREATE TABLE js_sys_employee
 	emp_code varchar2(64) NOT NULL,
 	emp_name nvarchar2(100) NOT NULL,
 	emp_name_en varchar2(100),
+	emp_no nvarchar2(100),
 	office_code varchar2(64) NOT NULL,
 	office_name nvarchar2(100) NOT NULL,
 	company_code varchar2(64),
@@ -898,7 +899,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code);
 CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date);
 CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id);
 CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code);
-CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status);
+CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status);
 CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star);
 CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type);
 CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code);
@@ -1126,7 +1127,8 @@ COMMENT ON COLUMN js_sys_dict_type.remarks IS '备注信息';
 COMMENT ON TABLE js_sys_employee IS '员工表';
 COMMENT ON COLUMN js_sys_employee.emp_code IS '员工编码';
 COMMENT ON COLUMN js_sys_employee.emp_name IS '员工姓名';
-COMMENT ON COLUMN js_sys_employee.emp_name_en IS '英文名';
+COMMENT ON COLUMN js_sys_employee.emp_name_en IS '员工英文名';
+COMMENT ON COLUMN js_sys_employee.emp_no IS '员工工号';
 COMMENT ON COLUMN js_sys_employee.office_code IS '机构编码';
 COMMENT ON COLUMN js_sys_employee.office_name IS '机构名称';
 COMMENT ON COLUMN js_sys_employee.company_code IS '公司编码';
--- a/modules/core/db/postgresql/core.sql
+++ b/modules/core/db/postgresql/core.sql
@@ -261,6 +261,7 @@ CREATE TABLE js_sys_employee
 	emp_code varchar(64) NOT NULL,
 	emp_name varchar(100) NOT NULL,
 	emp_name_en varchar(100),
+	emp_no varchar(100),
 	office_code varchar(64) NOT NULL,
 	office_name varchar(100) NOT NULL,
 	company_code varchar(64),
@@ -898,7 +899,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code);
 CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date);
 CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id);
 CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code);
-CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status);
+CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status);
 CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star);
 CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type);
 CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code);
@@ -1126,7 +1127,8 @@ COMMENT ON COLUMN js_sys_dict_type.remarks IS '备注信息';
 COMMENT ON TABLE js_sys_employee IS '员工表';
 COMMENT ON COLUMN js_sys_employee.emp_code IS '员工编码';
 COMMENT ON COLUMN js_sys_employee.emp_name IS '员工姓名';
-COMMENT ON COLUMN js_sys_employee.emp_name_en IS '英文名';
+COMMENT ON COLUMN js_sys_employee.emp_name_en IS '员工英文名';
+COMMENT ON COLUMN js_sys_employee.emp_no IS '员工工号';
 COMMENT ON COLUMN js_sys_employee.office_code IS '机构编码';
 COMMENT ON COLUMN js_sys_employee.office_name IS '机构名称';
 COMMENT ON COLUMN js_sys_employee.company_code IS '公司编码';
--- a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
--- a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.8.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.8.sql
@@ -4,4 +4,4 @@ ALTER TABLE ${_prefix}sys_employee ADD emp_no varchar(100) NULL;

 -- 新增 BPM 模块
 INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks)
-VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', now(), 'system', now(), NULL);
+VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.x', NULL, '0', 'system', getdate(), 'system', getdate(), NULL);
--- a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.8.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.8.sql
@@ -5,4 +5,4 @@ ADD COLUMN `emp_no` varchar(100) NULL COMMENT '员工工号' AFTER `emp_code`;

 -- 新增 BPM 模块
 INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks)
-VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', now(), 'system', now(), NULL);
+VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.x', NULL, '0', 'system', now(), 'system', now(), NULL);
--- a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.8.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.8.sql
@@ -5,4 +5,4 @@ COMMENT ON COLUMN ${_prefix}sys_employee.emp_no IS '员工工号';

 -- 新增 BPM 模块
 INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks)
-VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', sysdate, 'system', sysdate, NULL);
+VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.x', NULL, '0', 'system', sysdate, 'system', sysdate, NULL);
--- a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.8.sql
+++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.8.sql
@@ -5,4 +5,4 @@ COMMENT ON COLUMN ${_prefix}sys_employee.emp_no IS '员工工号';

 -- 新增 BPM 模块
 INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks)
-VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', now(), 'system', now(), NULL);
+VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.x', NULL, '0', 'system', now(), 'system', now(), NULL);
--- a/modules/core/src/main/resources/db/upgrade/core/versions
+++ b/modules/core/src/main/resources/db/upgrade/core/versions
@@ -13,4 +13,5 @@
 4.1.4
 4.1.5
 4.1.6
-4.1.7
+4.1.7
+4.1.8