Merge branch 'master' of https://git.2fi-solutions.com/davidhui/TSMS-backend

src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt

@@ -684,12 +684,12 @@ open class ReportService(
         rowIndex = 9
         sheet.getRow(rowIndex).apply {
             createCell(1).apply {
-                setCellValue(project.expectedTotalFee!!)
+                setCellValue(project.expectedTotalFee!! * 0.8)
                 cellStyle.dataFormat = accountingStyle
             }
 
             createCell(2).apply {
-                setCellValue(project.expectedTotalFee!! / 0.8)
+                setCellValue(project.expectedTotalFee!!)
                 cellStyle.dataFormat = accountingStyle
             }
         }

src/main/resources/db/changelog/changes/20240529_01_cyril/01_insert_authority.sql

@@ -0,0 +1,8 @@
+-- liquibase formatted sql
+-- changeset cyril:authority, user_authority
+
+INSERT INTO authority (authority,name)
+VALUES ('DELETE_PROJECT','delete project');
+
+INSERT INTO user_authority (userId,authId)
+VALUES (1,19);