Merge remote-tracking branch 'origin/dev_1.1.3' into dev_1.1.3

sop-api/install/mysql/upgrade/1.1.3.sql

@@ -105,3 +105,13 @@ INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, r
 
 ALTER TABLE t_b_ding_statistic_by_person
     ADD COLUMN user_id BIGINT NULL COMMENT '用户id' AFTER service_name;
+
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2123', '工时统计-统计计算', '/api/admin/tb/ding/statistic/calculate', 'URL', '29', '4', 'AUTH', '1', '1', '0');
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES ('2124', '统计计算', 'Calculate', 'BUTTON', '29', '5', 'AUTH', '2123', '1', '0', '1');
+
+DELETE FROM sys_privilege WHERE (id = '2123');
+DELETE FROM sys_privilege WHERE (id = '2124');
+
+UPDATE t_d_form_widget
+SET code='FILE', `type`='FORM', form_id='example_photos', form_name='example_photos', title='示例', input_type='ARRAY', required=0, readable=1, writable=0, visable=1, `scale`=NULL, `length`=2, binding=NULL, data_grid='https://sop-file.qmth.com.cn/logo/1.png,https://sop-file.qmth.com.cn/logo/2.png', tips=NULL, format=NULL, span=12, sub_title=NULL, `options`=NULL, flow_type='CLOUD_MARK_SOP_FLOW', form_setup=4, handle=0, form_group=NULL, role_type=NULL, create_id=1, create_time=2
+WHERE id=201;

sop-api/src/main/resources/application.properties

@@ -10,11 +10,11 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=sop-api
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=192.168.10.83
+db.host=localhost
 db.port=3306
-db.name=sop_db_test
-db.username=sop_db_test
-db.password=sop_db_test
+db.name=sop_db
+db.username=root
+db.password=123456789
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true